/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: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

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
35
36
from bzrlib.iterablefile import IterableFile
36
37
 
37
38
# XXX: some redundancy is allowing to write stanzas in isolation as well as
377
378
        _read_stanza_unicode,
378
379
        _valid_tag,
379
380
        )
380
 
except ImportError:
 
381
except ImportError, e:
 
382
    osutils.failed_to_load_extension(e)
381
383
    from bzrlib._rio_py import (
382
384
       _read_stanza_utf8,
383
385
       _read_stanza_unicode,