← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: Aaron Bentley
  • Date: 2006-08-24 03:35:48 UTC
  • mto: (1910.2.43 format-bumps)
  • mto: This revision was merged to the branch mainline in revision 1997.
  • Revision ID: aaron.bentley@utoronto.ca-20060824033548-104450f485b42c75
Fix bugs in basis inventory handling, change filename

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
37
37
    import util.elementtree as elementtree
38
38
 
39
39
from bzrlib.errors import BzrError
 
40
from bzrlib import errors
40
41
 
41
42
 
42
43
class Serializer(object):
50
51
        return tostring(self._pack_inventory(inv)) + '\n'
51
52
 
52
53
    def read_inventory_from_string(self, xml_string):
53
 
        return self._unpack_inventory(fromstring(xml_string))
 
54
        try:
 
55
            return self._unpack_inventory(fromstring(xml_string))
 
56
        except SyntaxError, e:
 
57
            raise errors.UnexpectedInventoryFormat(e)
54
58
 
55
59
    def read_inventory(self, f):
56
 
        return self._unpack_inventory(self._read_element(f))
 
60
        try:
 
61
            return self._unpack_inventory(self._read_element(f))
 
62
        except SyntaxError, e:
 
63
            raise errors.UnexpectedInventoryFormat(e)
57
64
 
58
65
    def write_revision(self, rev, f):
59
66
        self._write_element(self._pack_revision(rev), f)