← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: Andrew Bennetts
  • Date: 2010-09-17 04:35:23 UTC
  • mfrom: (5050.17.20 2.2)
  • mto: This revision was merged to the branch mainline in revision 5431.
  • Revision ID: andrew.bennetts@canonical.com-20100917043523-c5t63gmvxqxmqh5j
Merge lp:bzr/2.2, including fixes for #625574, #636930, #254278.

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)