/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-01-30 00:49:41 UTC
  • mto: (3982.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3983.
  • Revision ID: v.ladeuil+lp@free.fr-20090130004941-820fpd2ryyo127vv
Add more tests, fix pycurl double handling, revert previous tracking.

* bzrlib/tests/test_http.py:
(PredefinedRequestHandler): Renamed from
PreRecordedRequestHandler.
(PredefinedRequestHandler.handle_one_request): Get the canned
response from the test server directly.
(ActivityServerMixin): Make it a true object and intialize the
attributes in the constructor. Tests can now set the
canned_response attribute before querying the server.
(TestActivity.setUp, TestActivity.tearDown,
TestActivity.get_transport, TestActivity.assertActivitiesMatch):
Extracted from test_get to be able to write other tests.
(TestActivity.test_has, TestActivity.test_readv,
TestActivity.test_post): New tests, all cases should be covered
now.

* bzrlib/transport/http/response.py:
(RangeFile.__init__, RangeFile.read, handle_response): Revert
previous tracking, both http implementations can now report
activity from the socket.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get_ranged, PyCurlTransport._post): Revert
previous tracking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
 *
16
16
 * You should have received a copy of the GNU General Public License
17
17
 * along with this program; if not, write to the Free Software
18
 
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
18
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19
19
 */
20
20
 
21
21
/* Provide the typedefs that pyrex does automatically in newer versions, to
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 */