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

  • Committer: Vincent Ladeuil
  • Date: 2009-06-30 16:59:21 UTC
  • mto: (4493.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4496.
  • Revision ID: v.ladeuil+lp@free.fr-20090630165921-jdg42f5unm33nz8a
Fix failing test.

* bzrlib/tests/blackbox/test_revision_info.py:
Minor cleanups.

* bzrlib/tests/blackbox/test_revno.py:
Some cleanups.

* bzrlib/builtins.py: 
(cmd_revno.run): Don't open WT if we don't need to.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/rio.py
32
32
 
33
33
import re
34
34
 
35
 
from bzrlib import osutils
36
35
from bzrlib.iterablefile import IterableFile
37
36
 
38
37
# XXX: some redundancy is allowing to write stanzas in isolation as well as
378
377
        _read_stanza_unicode,
379
378
        _valid_tag,
380
379
        )
381
 
except ImportError, e:
382
 
    osutils.failed_to_load_extension(e)
 
380
except ImportError:
383
381
    from bzrlib._rio_py import (
384
382
       _read_stanza_utf8,
385
383
       _read_stanza_unicode,