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

  • Committer: Jelmer Vernooij
  • Author(s): Richard Wilbur
  • Date: 2017-05-30 23:37:11 UTC
  • mto: This revision was merged to the branch mainline in revision 6645.
  • Revision ID: jelmer@jelmer.uk-20170530233711-r0m0qp8hpkqzpopw
https://launchpad.net/bugs/1537319
Fix order in which files are processed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/rio.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
# \subsection{\emph{rio} - simple text metaformat}
18
20
#
19
21
# \emph{r} stands for `restricted', `reproducible', or `rfc822-like'.
32
34
 
33
35
import re
34
36
 
35
 
from bzrlib import osutils
36
 
from bzrlib.iterablefile import IterableFile
 
37
from . import osutils
 
38
from .iterablefile import IterableFile
37
39
 
38
40
# XXX: some redundancy is allowing to write stanzas in isolation as well as
39
41
# through a writer object.
373
375
 
374
376
 
375
377
try:
376
 
    from bzrlib._rio_pyx import (
 
378
    from ._rio_pyx import (
377
379
        _read_stanza_utf8,
378
380
        _read_stanza_unicode,
379
381
        _valid_tag,
380
382
        )
381
 
except ImportError, e:
 
383
except ImportError as e:
382
384
    osutils.failed_to_load_extension(e)
383
 
    from bzrlib._rio_py import (
 
385
    from ._rio_py import (
384
386
       _read_stanza_utf8,
385
387
       _read_stanza_unicode,
386
388
       _valid_tag,