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

Merge 2.0 into 2.1 resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
23
23
# ElementTree bits
24
24
 
25
25
from bzrlib.serializer import Serializer
26
 
from bzrlib.trace import mutter
 
26
from bzrlib.trace import mutter, warning
27
27
 
28
28
try:
29
29
    try:
31
31
        from xml.etree.cElementTree import (ElementTree, SubElement, Element,
32
32
            XMLTreeBuilder, fromstring, tostring)
33
33
        import xml.etree as elementtree
 
34
        # Also import ElementTree module so monkey-patching below always works
 
35
        import xml.etree.ElementTree
34
36
    except ImportError:
35
37
        from cElementTree import (ElementTree, SubElement, Element,
36
38
                                  XMLTreeBuilder, fromstring, tostring)