~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bencode.py

  • Committer: Martin Pool
  • Date: 2009-06-10 03:31:01 UTC
  • mfrom: (4070.12.3 249908-doc-generate)
  • mto: This revision was merged to the branch mainline in revision 4464.
  • Revision ID: mbp@sourcefrog.net-20090610033101-ce26xd79i9cbmpsd
Merge other outstanding work on 249908

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
 
 
21
19
try:
22
20
    from bzrlib._bencode_pyx import bdecode, bdecode_as_tuple, bencode, Bencached
23
 
except ImportError, e:
24
 
    osutils.failed_to_load_extension(e)
 
21
except ImportError:
25
22
    from bzrlib.util._bencode_py import bdecode, bdecode_as_tuple, bencode, Bencached