Rev 5089: (mbp) Merge up 2.1 to 2.2, fixing bug 254278 (Martin Pool) in file:///home/pqm/archives/thelove/bzr/2.2/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.2/

------------------------------------------------------------
revno: 5089 [merge]
revision-id: pqm at pqm.ubuntu.com-20100915100907-icd1mnify8zwgiw8
parent: pqm at pqm.ubuntu.com-20100914150947-prj9ec5vbo0rcqj3
parent: mbp at sourcefrog.net-20100915084855-bm6db6yy2f1jdh8a
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Wed 2010-09-15 11:09:07 +0100
message:
  (mbp) Merge up 2.1 to 2.2, fixing bug 254278 (Martin Pool)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
=== modified file 'NEWS'
--- a/NEWS	2010-09-14 15:09:47 +0000
+++ b/NEWS	2010-09-15 08:48:55 +0000
@@ -1151,6 +1151,10 @@
 * Raise ValueError instead of a string exception.
   (John Arbash Meinel, #586926)
 
+* Stop ``AttributeError: 'module' object has no attribute 'ElementTree'``
+  being thrown from ``xml_serializer`` on certain cElementTree setups.
+  (Martin [gz], #254278)
+
 Improvements
 ************
 

=== modified file 'bzrlib/xml_serializer.py'
--- a/bzrlib/xml_serializer.py	2010-05-25 17:27:52 +0000
+++ b/bzrlib/xml_serializer.py	2010-09-15 08:48:55 +0000
@@ -31,6 +31,8 @@
         from xml.etree.cElementTree import (ElementTree, SubElement, Element,
             XMLTreeBuilder, fromstring, tostring)
         import xml.etree as elementtree
+        # Also import ElementTree module so monkey-patching below always works
+        import xml.etree.ElementTree
     except ImportError:
         from cElementTree import (ElementTree, SubElement, Element,
                                   XMLTreeBuilder, fromstring, tostring)