/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

  • Committer: John Arbash Meinel
  • Date: 2010-09-29 20:18:37 UTC
  • mfrom: (5450 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5452.
  • Revision ID: john@arbash-meinel.com-20100929201837-6d9jhvjokfe3ubvk
Merge bzr.dev 5450 to resolve NEWS and criss-cross merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
33
33
        from xml.etree.cElementTree import (ElementTree, SubElement, Element,
34
34
            XMLTreeBuilder, fromstring, tostring)
35
35
        import xml.etree as elementtree
 
36
        # Also import ElementTree module so monkey-patching below always works
 
37
        import xml.etree.ElementTree
36
38
    except ImportError:
37
39
        from cElementTree import (ElementTree, SubElement, Element,
38
40
                                  XMLTreeBuilder, fromstring, tostring)