/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: Robert Collins
  • Date: 2008-07-01 03:38:35 UTC
  • mfrom: (3514 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3515.
  • Revision ID: robertc@robertcollins.net-20080701033835-dwbt0f0x3vmf5atr
Merge bzr.dev, fixing minor skew.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
34
34
    except ImportError:
35
35
        from cElementTree import (ElementTree, SubElement, Element,
36
36
                                  XMLTreeBuilder, fromstring, tostring)
37
 
        import elementtree
 
37
        import elementtree.ElementTree
38
38
    ParseError = SyntaxError
39
39
except ImportError:
40
40
    mutter('WARNING: using slower ElementTree; consider installing cElementTree'