Rev 3495: (jam) Make sure we always have access to the elementtree.ElementTree in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3495
revision-id:pqm at pqm.ubuntu.com-20080612170229-8h3mrl35jgqhs0gt
parent: pqm at pqm.ubuntu.com-20080611120348-tqhq37qvfz624jyb
parent: john at arbash-meinel.com-20080612155115-0wd59iyv2njaigx7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-06-12 18:02:29 +0100
message:
  (jam) Make sure we always have access to the elementtree.ElementTree
  	module.
modified:
  bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
    ------------------------------------------------------------
    revno: 3475.1.2
    revision-id:john at arbash-meinel.com-20080612155115-0wd59iyv2njaigx7
    parent: j at oil21.org-20080605121314-kv2l34nc1knvj7q5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2008-06-12 10:51:15 -0500
    message:
      Fix missing import
    modified:
      bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
=== modified file 'bzrlib/xml_serializer.py'
--- a/bzrlib/xml_serializer.py	2008-03-28 02:10:23 +0000
+++ b/bzrlib/xml_serializer.py	2008-06-12 15:51:15 +0000
@@ -34,7 +34,7 @@
     except ImportError:
         from cElementTree import (ElementTree, SubElement, Element,
                                   XMLTreeBuilder, fromstring, tostring)
-        import elementtree
+        import elementtree.ElementTree
     ParseError = SyntaxError
 except ImportError:
     mutter('WARNING: using slower ElementTree; consider installing cElementTree'