Merge lp:~gz/bzr/2.1_missing_ElementTree_254278 into lp:bzr/2.1

[Martin Packman]

Prevent AttributeError in xml_serializer on certain cElementTree setups

Trying again to get this targeted at lp:bzr/2.1 rather than trunk...

One line fix for an old issue with ElementTree monkey-patching that can apparently still be hit in certain circumstances. I can't reproduce the problem myself, but confirmed on IRC that this change is sufficient, and the 2.3 approach of removing all that code entirely is not required.

To replay the fun as it happened, read:
<http://irclogs.ubuntu.com/2010/09/09/%23bzr.html#t15:03>

[Vincent Ladeuil (vila)]

Ok, I'll land this one.

Yet, can you ensure this will get merged cleanly in 2.2 and dev ?
Ping me on IRC if you need help with that.

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-09-10 05:13:57 +0000
+++ NEWS	2010-09-10 15:06:00 +0000
@@ -48,6 +48,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'
--- bzrlib/xml_serializer.py	2010-02-17 17:11:16 +0000
+++ bzrlib/xml_serializer.py	2010-09-10 15:06:00 +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)