aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang/python/files/2.6/62_all_xml.use_pyxml.patch')
-rw-r--r--dev-lang/python/files/2.6/62_all_xml.use_pyxml.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/dev-lang/python/files/2.6/62_all_xml.use_pyxml.patch b/dev-lang/python/files/2.6/62_all_xml.use_pyxml.patch
deleted file mode 100644
index 757299b..0000000
--- a/dev-lang/python/files/2.6/62_all_xml.use_pyxml.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- Lib/xml/__init__.py
-+++ Lib/xml/__init__.py
-@@ -28,20 +28,23 @@
- _MINIMUM_XMLPLUS_VERSION = (0, 8, 4)
-
-
--try:
-+def use_pyxml():
- import _xmlplus
--except ImportError:
-- pass
--else:
-- try:
-- v = _xmlplus.version_info
-- except AttributeError:
-- # _xmlplus is too old; ignore it
-- pass
-+ v = _xmlplus.version_info
-+ if v >= _MINIMUM_XMLPLUS_VERSION:
-+ import sys
-+ _xmlplus.__path__.extend(__path__)
-+ sys.modules[__name__] = _xmlplus
-+ cleared_modules = []
-+ redefined_modules = []
-+ for module in sys.modules:
-+ if module.startswith("xml.") and not module.startswith(("xml.marshal", "xml.schema", "xml.utils", "xml.xpath", "xml.xslt")):
-+ cleared_modules.append(module)
-+ if module.startswith(("xml.__init__", "xml.dom", "xml.parsers", "xml.sax")) and sys.modules[module] is not None:
-+ redefined_modules.append(module)
-+ for module in cleared_modules:
-+ del sys.modules[module]
-+ for module in sorted(redefined_modules):
-+ __import__(module)
- else:
-- if v >= _MINIMUM_XMLPLUS_VERSION:
-- import sys
-- _xmlplus.__path__.extend(__path__)
-- sys.modules[__name__] = _xmlplus
-- else:
-- del v
-+ raise ImportError("PyXML too old: %s" % ".".join(str(x) for x in v))