Merge pull request #6 from jantman/pip902

pip 9.0.2 and 10 fixes
jantman · Mar 18, 2018 · 4a23c60 · 4a23c60
2 parents 09a039b + 5238161
commit 4a23c60
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,4 @@ bin/
 include/
 
 .idea/
+.pytest_cache/
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,9 +1,10 @@
 Changelog
 =========
 
-Unreleased Changes
+0.1.2 (2018-03-18)
 ------------------
 
+* Fix `Issue #5 <https://github.com/jantman/versionfinder/issues/5>`_ where ``import pip`` fails if ``requests`` has previously been imported. Also proactive fix for pip10 changes.
 * Multiple test fixes
 
 0.1.1 (2017-06-16)

diff --git a/versionfinder/version.py b/versionfinder/version.py
@@ -35,5 +35,5 @@
 ##################################################################################
 """
 
-VERSION = '0.1.1'
+VERSION = '0.1.2'
 PROJECT_URL = 'https://github.com/jantman/versionfinder'
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