From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Thu, 16 Feb 2012 22:28:35 +0000 (+0100)
Subject: fix the _namespace_map cleanup for cElementTree tests.
X-Git-Tag: v3.3.0a1~161^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1639505c383a1c8b46ff6f2a5b9071f26ad43ece;p=thirdparty%2FPython%2Fcpython.git

fix the _namespace_map cleanup for cElementTree tests.
---

diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index 8713de5f5934..58fdcd4c5c60 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1881,12 +1881,7 @@ class CleanContext(object):
 
     def __enter__(self):
         from xml.etree import ElementPath
-        if hasattr(ET, '_namespace_map'):
-            self._nsmap = ET._namespace_map
-        else:
-            # when testing the cElementTree alias
-            from xml.etree.ElementTree import _namespace_map
-            self._nsmap = _namespace_map
+        self._nsmap = ET.register_namespace._namespace_map
         # Copy the default namespace mapping
         self._nsmap_copy = self._nsmap.copy()
         # Copy the path cache (should be empty)
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
index 93147ebc72a2..defef0d0ebca 100644
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -1086,6 +1086,8 @@ _namespace_map = {
     # dublin core
     "http://purl.org/dc/elements/1.1/": "dc",
 }
+# For tests and troubleshooting
+register_namespace._namespace_map = _namespace_map
 
 def _raise_serialization_error(text):
     raise TypeError(