From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Sun, 3 Jun 2012 06:34:34 +0000 (+0200)
Subject: Delete workaround for http://bugs.python.org/issue14007.
X-Git-Tag: v2.2.0_alpha110~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f75fed63cb0256505d684ce524d65c9086af0879;p=portage.git

Delete workaround for bugs.python.org/issue14007.
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 56af9e48f..84cac7411 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -335,16 +335,6 @@ _python_interpreter = os.path.realpath(sys.executable)
 _bin_path = PORTAGE_BIN_PATH
 _pym_path = PORTAGE_PYM_PATH
 
-if sys.hexversion >= 0x3030000:
-	# Workaround for http://bugs.python.org/issue14007
-	def _test_xml_etree_ElementTree_TreeBuilder_type():
-		import subprocess
-		p = subprocess.Popen([_python_interpreter, "-c",
-			"import sys, xml.etree.ElementTree; sys.exit(not isinstance(xml.etree.ElementTree.TreeBuilder, type))"])
-		if p.wait() != 0:
-			sys.modules["_elementtree"] = None
-	_test_xml_etree_ElementTree_TreeBuilder_type()
-
 def _shell_quote(s):
 	"""
 	Quote a string in double-quotes and use backslashes to