← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: Martin
  • Date: 2010-09-09 17:24:10 UTC
  • mto: (4797.58.10 2.1)
  • mto: This revision was merged to the branch mainline in revision 5431.
  • Revision ID: gzlist@googlemail.com-20100909172410-5pgfvsx8mst0d3af
https://launchpad.net/bugs/254278
Prevent AttributeError in xml_serializer on certain cElementTree setups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
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)