pip import fixup for pip10 and pypa/pip#5079

jantman · Mar 18, 2018 · 61632c1 · 61632c1
1 parent 09a039b
commit 61632c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,4 @@ bin/
 include/
 
 .idea/
+.pytest_cache/
diff --git a/versionfinder/versionfinder.py b/versionfinder/versionfinder.py
@@ -45,10 +45,13 @@
 from .versioninfo import VersionInfo
 
 try:
-    import pip
+    import pip._internal as pip
 except ImportError:
-    # this is used within try blocks; NBD if they fail
-    pass
+    try:
+        import pip
+    except (ImportError, KeyError):
+        # this is used within try blocks; NBD if they fail
+        pass
 
 try:
     import pkg_resources