← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/rio.py

  • Committer: Vincent Ladeuil
  • Date: 2011-09-09 13:30:12 UTC
  • mfrom: (5609.48.11 2.3)
  • mto: (6015.33.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6134.
  • Revision ID: v.ladeuil+lp@free.fr-20110909133012-jc1d1zyqgak57123
Merge 2.3 into 2.4

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,