← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bencode.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-19 00:32:14 UTC
  • mfrom: (4685.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090919003214-2dli9jc4y5xhjj3n
(mbp for garyvdm) Revert rename of
        test_merge_uncommitted_otherbasis_ancestor_of_thisbasis.

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
 
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