~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bencode.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-12 21:44:27 UTC
  • mto: This revision was merged to the branch mainline in revision 4737.
  • Revision ID: john@arbash-meinel.com-20091012214427-zddi1kmc2jlf7v31
Py_ssize_t and its associated function typedefs are not available w/ python 2.4

So we define them in python-compat.h
Even further, gcc issued a warning for:
static int
_workaround_pyrex_096()
So we changed it to:
_workaround_pyrex_096(void)

Also, some python api funcs were incorrectly defined as 'char *' when they meant
'const char *'. Work around that with a (char *) cast, to avoid compiler warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
"""Wrapper around the bencode pyrex and python implementation"""
18
18
 
 
19
from bzrlib import osutils
 
20
 
19
21
try:
20
22
    from bzrlib._bencode_pyx import bdecode, bdecode_as_tuple, bencode, Bencached
21
 
except ImportError:
 
23
except ImportError, e:
 
24
    osutils.failed_to_load_extension(e)
22
25
    from bzrlib.util._bencode_py import bdecode, bdecode_as_tuple, bencode, Bencached