← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: Vincent Ladeuil
  • Date: 2007-07-15 11:24:18 UTC
  • mfrom: (2617 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070715112418-9nn4n6esxv60ny4b
merge bzr.dev@1617

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
1
 
# -*- coding: UTF-8 -*-
2
 
 
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
25
25
from bzrlib.trace import mutter, warning
26
26
 
27
27
try:
28
 
    from cElementTree import (ElementTree, SubElement, Element,
29
 
                              XMLTreeBuilder, fromstring, tostring)
30
 
    import elementtree
 
28
    try:
 
29
        # it's in this package in python2.5
 
30
        from xml.etree.cElementTree import (ElementTree, SubElement, Element,
 
31
            XMLTreeBuilder, fromstring, tostring)
 
32
        import xml.etree as elementtree
 
33
    except ImportError:
 
34
        from cElementTree import (ElementTree, SubElement, Element,
 
35
                                  XMLTreeBuilder, fromstring, tostring)
 
36
        import elementtree
 
37
    ParseError = SyntaxError
31
38
except ImportError:
32
39
    mutter('WARNING: using slower ElementTree; consider installing cElementTree'
33
40
           " and make sure it's on your PYTHONPATH")
 
41
    # this copy is shipped with bzr
34
42
    from util.elementtree.ElementTree import (ElementTree, SubElement,
35
43
                                              Element, XMLTreeBuilder,
36
44
                                              fromstring, tostring)
37
45
    import util.elementtree as elementtree
 
46
    from xml.parsers.expat import ExpatError as ParseError
38
47
 
39
 
from bzrlib.errors import BzrError
 
48
from bzrlib import errors
40
49
 
41
50
 
42
51
class Serializer(object):
50
59
        return tostring(self._pack_inventory(inv)) + '\n'
51
60
 
52
61
    def read_inventory_from_string(self, xml_string):
53
 
        return self._unpack_inventory(fromstring(xml_string))
 
62
        try:
 
63
            return self._unpack_inventory(fromstring(xml_string))
 
64
        except ParseError, e:
 
65
            raise errors.UnexpectedInventoryFormat(e)
54
66
 
55
67
    def read_inventory(self, f):
56
 
        return self._unpack_inventory(self._read_element(f))
 
68
        try:
 
69
            return self._unpack_inventory(self._read_element(f))
 
70
        except ParseError, e:
 
71
            raise errors.UnexpectedInventoryFormat(e)
57
72
 
58
73
    def write_revision(self, rev, f):
59
74
        self._write_element(self._pack_revision(rev), f)