fix importing when sys.meta_path is empty (fixes #72)

2 files changed, 16 insertions, 10 deletions

diff --git a/CHANGES b/CHANGES
index b5fabfa..b921827 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,11 @@ Changelog for six
 
 This file lists the changes in each six version.
 
+1.7.2
+-----
+
+- Issue #72: Fix installing on Python 2.
+
 1.7.1
 -----
 
diff --git a/six.py b/six.py
index 25f8cd3..589b7ac 100644
--- a/six.py
+++ b/six.py
@@ -741,15 +741,16 @@ except NameError:
 # Remove other six meta path importers, since they cause problems. This can
 # happen if six is removed from sys.modules and then reloaded. (Setuptools does
 # this for some reason.)
-for i, importer in enumerate(sys.meta_path):
-    # Here's some real nastiness: Another "instance" of the six module might be
-    # floating around. Therefore, we can't use isinstance() to check for the six
-    # meta path importer, since the other six instance will have inserted an
-    # importer with different class.
-    if (type(importer).__name__ == "_SixMetaPathImporter" and
-        importer.name == __name__):
-        del sys.meta_path[i]
-        break
-del i, importer
+if sys.meta_path:
+    for i, importer in enumerate(sys.meta_path):
+        # Here's some real nastiness: Another "instance" of the six module might
+        # be floating around. Therefore, we can't use isinstance() to check for
+        # the six meta path importer, since the other six instance will have
+        # inserted an importer with different class.
+        if (type(importer).__name__ == "_SixMetaPathImporter" and
+            importer.name == __name__):
+            del sys.meta_path[i]
+            break
+    del i, importer
 # Finally, add the importer to the meta path import hook.
 sys.meta_path.append(_importer)