← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml.py

  • Committer: Aaron Bentley
  • Date: 2005-07-29 17:19:16 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1020.
  • Revision ID: abentley@panoramicfeedback.com-20050729171916-322fd81b451d2e3e
Added merge-type parameter to merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml.py
22
22
 
23
23
# importing this module is fairly slow because it has to load several ElementTree bits
24
24
try:
25
 
    from util.cElementTree import ElementTree, SubElement, Element
 
25
    from cElementTree import ElementTree, SubElement, Element
26
26
except ImportError:
27
 
    from util.elementtree.ElementTree import ElementTree, SubElement, Element
 
27
    from elementtree.ElementTree import ElementTree, SubElement, Element
28
28
 
29
29
 
30
30
def pack_xml(o, f):