← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

(gz) Remove bzrlib/util/elementtree/ package (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
26
26
 
27
27
import re
28
28
 
29
 
from bzrlib.serializer import Serializer
30
 
from bzrlib.trace import mutter
31
 
 
32
29
try:
 
30
    import xml.etree.cElementTree as elementtree
 
31
    ParseError = getattr(elementtree, "ParseError", SyntaxError)
 
32
except ImportError:
 
33
    # Fall back to pure python implementation if C extention is unavailable
 
34
    import xml.etree.ElementTree as elementtree
33
35
    try:
34
 
        # it's in this package in python2.5
35
 
        from xml.etree.cElementTree import (ElementTree, SubElement, Element,
36
 
            XMLTreeBuilder, fromstring, tostring)
37
 
        import xml.etree as elementtree
38
 
        # Also import ElementTree module so monkey-patching below always works
39
 
        import xml.etree.ElementTree
 
36
        from xml.etree.ElementTree import ParseError
40
37
    except ImportError:
41
 
        from cElementTree import (ElementTree, SubElement, Element,
42
 
                                  XMLTreeBuilder, fromstring, tostring)
43
 
        import elementtree.ElementTree
44
 
    ParseError = SyntaxError
45
 
except ImportError:
46
 
    mutter('WARNING: using slower ElementTree; consider installing cElementTree'
47
 
           " and make sure it's on your PYTHONPATH")
48
 
    # this copy is shipped with bzr
49
 
    from util.elementtree.ElementTree import (ElementTree, SubElement,
50
 
                                              Element, XMLTreeBuilder,
51
 
                                              fromstring, tostring)
52
 
    import util.elementtree as elementtree
53
 
    from xml.parsers.expat import ExpatError as ParseError
 
38
        from xml.parsers.expat import ExpatError as ParseError
 
39
 
 
40
(ElementTree, SubElement, Element, XMLTreeBuilder, fromstring, tostring) = (
 
41
    elementtree.ElementTree, elementtree.SubElement, elementtree.Element,
 
42
    elementtree.XMLTreeBuilder, elementtree.fromstring, elementtree.tostring)
 
43
 
54
44
 
55
45
from bzrlib import (
56
46
    cache_utf8,
 
47
    errors,
57
48
    inventory,
58
49
    lazy_regex,
59
 
    errors,
 
50
    serializer,
60
51
    )
61
52
 
62
53
 
63
 
class XMLSerializer(Serializer):
 
54
class XMLSerializer(serializer.Serializer):
64
55
    """Abstract XML object serialize/deserialize"""
65
56
 
66
57
    squashes_xml_invalid_characters = True