← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bencode.py

  • Committer: Jonathan Lange
  • Date: 2009-06-26 09:24:34 UTC
  • mfrom: (4431.3.10 prepare-1.16.1)
  • mto: This revision was merged to the branch mainline in revision 4485.
  • Revision ID: jml@canonical.com-20090626092434-qebn6kw4zs40picc
Merge the 1.16.1 changes back into trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bencode.py
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