← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-09-23 06:50:13 UTC
  • mfrom: (2027.4.6 inventory-takes-file-3631)
  • Revision ID: pqm@pqm.ubuntu.com-20060923065013-b8483dd421706cbe
(jam) allow 'bzr inventory filename' (bug #3631)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
28
28
    from cElementTree import (ElementTree, SubElement, Element,
29
29
                              XMLTreeBuilder, fromstring, tostring)
30
30
    import elementtree
 
31
    ParseError = SyntaxError
31
32
except ImportError:
32
33
    mutter('WARNING: using slower ElementTree; consider installing cElementTree'
33
34
           " and make sure it's on your PYTHONPATH")
35
36
                                              Element, XMLTreeBuilder,
36
37
                                              fromstring, tostring)
37
38
    import util.elementtree as elementtree
 
39
    from xml.parsers.expat import ExpatError as ParseError
38
40
 
39
 
from bzrlib.errors import BzrError
 
41
from bzrlib import errors
40
42
 
41
43
 
42
44
class Serializer(object):
50
52
        return tostring(self._pack_inventory(inv)) + '\n'
51
53
 
52
54
    def read_inventory_from_string(self, xml_string):
53
 
        return self._unpack_inventory(fromstring(xml_string))
 
55
        try:
 
56
            return self._unpack_inventory(fromstring(xml_string))
 
57
        except ParseError, e:
 
58
            raise errors.UnexpectedInventoryFormat(e)
54
59
 
55
60
    def read_inventory(self, f):
56
 
        return self._unpack_inventory(self._read_element(f))
 
61
        try:
 
62
            return self._unpack_inventory(self._read_element(f))
 
63
        except ParseError, e:
 
64
            raise errors.UnexpectedInventoryFormat(e)
57
65
 
58
66
    def write_revision(self, rev, f):
59
67
        self._write_element(self._pack_revision(rev), f)