Merge pull request #1890 from rotu/patch-1

Remove module importing hack

2 files changed, 22 insertions, 7 deletions

diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
index e8c616f9..4e79aa17 100644
--- a/setuptools/extern/__init__.py
+++ b/setuptools/extern/__init__.py
@@ -43,13 +43,6 @@ class VendorImporter:
                 __import__(extant)
                 mod = sys.modules[extant]
                 sys.modules[fullname] = mod
-                # mysterious hack:
-                # Remove the reference to the extant package/module
-                # on later Python versions to cause relative imports
-                # in the vendor package to resolve the same modules
-                # as those going through this importer.
-                if sys.version_info >= (3, ):
-                    del sys.modules[extant]
                 return mod
             except ImportError:
                 pass
diff --git a/setuptools/tests/test_extern.py b/setuptools/tests/test_extern.py
new file mode 100644
index 00000000..3519a680
--- /dev/null
+++ b/setuptools/tests/test_extern.py
@@ -0,0 +1,22 @@
+import importlib
+import pickle
+
+from setuptools import Distribution
+from setuptools.extern import ordered_set
+from setuptools.tests import py3_only
+
+
+def test_reimport_extern():
+    ordered_set2 = importlib.import_module(ordered_set.__name__)
+    assert ordered_set is ordered_set2
+
+
+def test_orderedset_pickle_roundtrip():
+    o1 = ordered_set.OrderedSet([1, 2, 5])
+    o2 = pickle.loads(pickle.dumps(o1))
+    assert o1 == o2
+
+
+@py3_only
+def test_distribution_picklable():
+    pickle.loads(pickle.dumps(Distribution()))