Origin: commit, revision id: jelmer@samba.org-20120221101416-t8d0yp7omic40qqt
Author: Jelmer Vernooij <jelmer@samba.org>
Description: Use correct elementtree
Last-Update: 2012-02-21
Applied-Upstream: no
X-Bzr-Revision-Id: jelmer@samba.org-20120221101416-t8d0yp7omic40qqt

=== modified file 'tests/elementtree_builder.py'
--- old/tests/elementtree_builder.py	2007-11-26 02:21:31 +0000
+++ new/tests/elementtree_builder.py	2012-02-21 10:14:16 +0000
@@ -1,7 +1,7 @@
 
-from bzrlib.xml_serializer import elementtree as elementtree
+from bzrlib.xml_serializer import elementtree
 
-ET = elementtree.ElementTree
+ET = elementtree
 
 class _E(object):
     """ This is the E factory, taken from http://effbot.org/zone/element-builder.htm """

=== modified file 'tests/test_annotate_xml.py'
--- old/tests/test_annotate_xml.py	2009-09-23 03:29:47 +0000
+++ new/tests/test_annotate_xml.py	2012-02-21 10:14:16 +0000
@@ -30,7 +30,7 @@
 
 from bzrlib.tests import TestCaseWithTransport
 from bzrlib.xml_serializer import elementtree as elementtree
-fromstring = elementtree.ElementTree.fromstring
+fromstring = elementtree.fromstring
 
 class TestXmlAnnotate(TestCaseWithTransport):
 
@@ -91,7 +91,8 @@
         self.assertEqualDiff(expected_xml, out)
         expected_elementtree = fromstring(expected_xml)
         current_elementtree = fromstring(out)
-        self.assertEquals(elementtree.ElementTree.tostring(expected_elementtree), elementtree.ElementTree.tostring(current_elementtree))
+        self.assertEquals(elementtree.tostring(expected_elementtree),
+                elementtree.tostring(current_elementtree))
 
     def test_xmlannotate_cmd_show_ids(self):
         out, err = self.run_bzr('xmlannotate hello.txt --show-ids')

=== modified file 'tests/test_log_xml.py'
--- old/tests/test_log_xml.py	2009-09-23 03:29:47 +0000
+++ new/tests/test_log_xml.py	2012-02-21 10:14:16 +0000
@@ -26,8 +26,8 @@
 from bzrlib.tests.blackbox import ExternalBase
 from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
 from bzrlib.xml_serializer import elementtree as elementtree
-fromstring = elementtree.ElementTree.fromstring
-elementtree_tostring = elementtree.ElementTree.tostring
+fromstring = elementtree.fromstring
+elementtree_tostring = elementtree.tostring
 
 class TestLog(ExternalBase):
 

=== modified file 'tests/test_ls_xml.py'
--- old/tests/test_ls_xml.py	2011-10-16 23:56:35 +0000
+++ new/tests/test_ls_xml.py	2012-02-21 10:14:16 +0000
@@ -21,7 +21,7 @@
 from bzrlib import ignores
 from bzrlib.tests import TestCaseWithTransport
 from bzrlib.xml_serializer import elementtree as elementtree
-fromstring = elementtree.ElementTree.fromstring
+fromstring = elementtree.fromstring
 
 
 class TestLSXML(TestCaseWithTransport):

=== modified file 'tests/test_status_xml.py'
--- old/tests/test_status_xml.py	2010-03-26 03:38:04 +0000
+++ new/tests/test_status_xml.py	2012-02-21 10:14:16 +0000
@@ -38,13 +38,11 @@
 from bzrlib.osutils import pathjoin
 from bzrlib.revisionspec import RevisionSpec
 from bzrlib.tests import TestCaseWithTransport, TestSkipped
-from bzrlib.workingtree import WorkingTree
 from bzrlib.xml_serializer import elementtree as elementtree
 
 import bzrlib.plugin
-from bzrlib.status import show_tree_status
-fromstring = elementtree.ElementTree.fromstring
-from elementtree_builder import (ET, _E)
+fromstring = elementtree.fromstring
+from elementtree_builder import _E
 
 ## little hack to load functions from parent module
 show_tree_status_xml = None
@@ -322,8 +320,9 @@
         self.assertEquals(result.findall('unknown/file')[0].text, "world.txt")
 
         result2 = fromstring(self.run_bzr("xmlstatus -r 0..")[0])
-        self.assertEquals(elementtree.ElementTree.tostring(result2),
-            elementtree.ElementTree.tostring(result))
+        self.assertEquals(
+            elementtree.tostring(result2),
+            elementtree.tostring(result))
 
     def test_statusxml_versioned(self):
         tree = self.make_branch_and_tree('.')
@@ -346,8 +345,9 @@
         self.assert_(len(result.findall('unknown/*')) == 0)
 
         result2 = fromstring(self.run_bzr("xmlstatus --versioned -r 0..")[0])
-        self.assertEquals(elementtree.ElementTree.tostring(result2),
-            elementtree.ElementTree.tostring(result))
+        self.assertEquals(
+            elementtree.tostring(result2),
+            elementtree.tostring(result))
 
     # Not yet implemneted
     #def assertStatusContains(self, xpath):

=== modified file 'tests/test_version_xml.py'
--- old/tests/test_version_xml.py	2011-03-09 22:58:39 +0000
+++ new/tests/test_version_xml.py	2012-02-21 10:14:16 +0000
@@ -27,7 +27,7 @@
     )
 
 from bzrlib.xml_serializer import elementtree as elementtree
-fromstring = elementtree.ElementTree.fromstring
+fromstring = elementtree.fromstring
 
 from bzrlib.plugins.xmloutput import versionxml
 

