From 9c6031cdc7e89b198db8ffc4cf2b4777997a7e78 Mon Sep 17 00:00:00 2001 From: "M. Dudley" Date: Tue, 3 Apr 2018 10:29:09 -0400 Subject: [PATCH] Fixed pip import to accomodate refactor in pip 10.0 --- pipdeptree.py | 6 +++++- tests/virtualenvs/pickle_env.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pipdeptree.py b/pipdeptree.py index f2f839a..7348437 100644 --- a/pipdeptree.py +++ b/pipdeptree.py @@ -13,7 +13,11 @@ try: except ImportError: from ordereddict import OrderedDict -import pip +try: + import pip._internal as pip +except ImportError: + import pip + import pkg_resources # inline: # from graphviz import backend, Digraph diff --git a/tests/virtualenvs/pickle_env.py b/tests/virtualenvs/pickle_env.py index ad8ee69..9ac3402 100755 --- a/tests/virtualenvs/pickle_env.py +++ b/tests/virtualenvs/pickle_env.py @@ -6,7 +6,10 @@ import pickle import sys -import pip +try: + import pip._internal as pip +except ImportError: + import pip def main():