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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/xml_serializer.py
42
42
    elementtree.XMLTreeBuilder, elementtree.fromstring, elementtree.tostring)
43
43
 
44
44
 
45
 
from breezy import (
 
45
from . import (
46
46
    cache_utf8,
47
47
    errors,
48
48
    inventory,
80
80
            return self._unpack_inventory(fromstring(xml_string), revision_id,
81
81
                                          entry_cache=entry_cache,
82
82
                                          return_from_cache=return_from_cache)
83
 
        except ParseError, e:
 
83
        except ParseError as e:
84
84
            raise errors.UnexpectedInventoryFormat(e)
85
85
 
86
86
    def read_inventory(self, f, revision_id=None):
90
90
                    revision_id=None)
91
91
            finally:
92
92
                f.close()
93
 
        except ParseError, e:
 
93
        except ParseError as e:
94
94
            raise errors.UnexpectedInventoryFormat(e)
95
95
 
96
96
    def write_revision(self, rev, f):