diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2012-02-16 23:28:35 +0100 |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2012-02-16 23:28:35 +0100 |
| commit | 1639505c383a1c8b46ff6f2a5b9071f26ad43ece (patch) | |
| tree | ed53c373225afdf1cdbf4c2874c97445f8704759 | |
| parent | e59a306081d8f34814b91dc9e911beac7271c452 (diff) | |
| download | cpython-git-1639505c383a1c8b46ff6f2a5b9071f26ad43ece.tar.gz | |
fix the _namespace_map cleanup for cElementTree tests.
| -rw-r--r-- | Lib/test/test_xml_etree.py | 7 | ||||
| -rw-r--r-- | Lib/xml/etree/ElementTree.py | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index 8713de5f59..58fdcd4c5c 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 93147ebc72..defef0d0eb 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( |