/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-08-20 13:26:36 UTC
  • mto: (4672.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4673.
  • Revision ID: v.ladeuil+lp@free.fr-20090820132636-i3rs1vf3d3fn46hq
Update doc and add NEWS entry.

* bzrlib/tests/test_plugins.py:
(TestEnvPluginPath.test_disable_core,
TestEnvPluginPath.test_disable_site,
TestEnvPluginPath.test_override_site,
TestEnvPluginPath.test_override_core):

* bzrlib/plugin.py:
(get_standard_plugins_path): Give a better explanantion and don't
break compatibility.

* bzrlib/help_topics/en/configuration.txt: 
(BZR_PLUGIN_PATH): Update doc.

* doc/en/user-guide/plugins.txt: 
Fix doc.

* doc/en/user-guide/writing_a_plugin.txt: 
Fix doc.

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