/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/bencode.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-01 15:17:33 UTC
  • mto: (4498.2.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4501.
  • Revision ID: v.ladeuil+lp@free.fr-20090701151733-i34hbbl7e2e1ta2o
Fixed as per John's review.

* bzrlib/tests/blackbox/test_send.py:
(load_tests): Delete spurious spaces in dict() definition.
(TestSendStrictWithChanges.setUp): Clarify the intent and mean of
the parametrization.

* bzrlib/send.py:
(send): Oops, fix the error messages.

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