/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/python-compat.h

  • Committer: Vincent Ladeuil
  • Date: 2009-05-08 13:39:32 UTC
  • mto: (4343.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4344.
  • Revision ID: v.ladeuil+lp@free.fr-20090508133932-4fbx4z8fvraeyjdy
Fixed as per John's and Markus reviews.

* bzrlib/tests/blackbox/test_push.py:
(TestPush.test_push_with_revisionspec): Fix wrong run_bzr_error
call. Additionnally the error regexp was wrong !

* bzrlib/tests/blackbox/test_ls.py:
(TestLS.test_ls_path, TestLS.test_kinds): Fix wrong run_bzr_error
calls.

* bzrlib/tests/__init__.py:
(TestCase.run_bzr): Add a check to catch errors in error_regexes
usage where people use a a string that it then iterated char by
char for matching (which is most certainly not the intent of the
test writer).

* bzrlib/tests/blackbox/test_log.py:
Fix run_bzr_error calls. Fix some white spaces issues (some
expected strings were using TABs and were wrongly caught by
test_coding_style(), but fixing the strings wasn't really a
problem either.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/python-compat.h
28
28
/* http://www.python.org/dev/peps/pep-0353/ */
29
29
#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
30
30
    typedef int Py_ssize_t;
31
 
    typedef Py_ssize_t (*lenfunc)(PyObject *);
32
 
    typedef PyObject * (*ssizeargfunc)(PyObject *, Py_ssize_t);
33
 
    typedef PyObject * (*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t);
34
31
    #define PY_SSIZE_T_MAX INT_MAX
35
32
    #define PY_SSIZE_T_MIN INT_MIN
36
33
    #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
70
67
    #include "arpa/inet.h"
71
68
#endif
72
69
 
73
 
#include <stdio.h>
74
 
 
75
 
#ifdef _MSC_VER
76
 
#define  snprintf  _snprintf
77
 
#endif
78
 
 
79
 
/* Introduced in Python 2.6 */
80
 
#ifndef Py_TYPE
81
 
#  define Py_TYPE(o) ((o)->ob_type)
82
 
#endif
83
 
#ifndef Py_REFCNT
84
 
#  define Py_REFCNT(o) ((o)->ob_refcnt)
85
 
#endif
86
70
 
87
71
#endif /* _BZR_PYTHON_COMPAT_H */