diff --git a/pipenv/help.py b/pipenv/help.py index ac8d70bd..e8fbf1c8 100644 --- a/pipenv/help.py +++ b/pipenv/help.py @@ -1,12 +1,11 @@ # coding: utf-8 import os +import pprint import sys + import pipenv -from itertools import chain -from pprint import pprint -from .__version__ import __version__ -from .core import project, system_which +from .core import project from .pep508checker import lookup from .vendor import pythonfinder @@ -21,26 +20,25 @@ def print_utf(line): def get_pipenv_diagnostics(): print("
$ pipenv --support") print("") - print("Pipenv version: `{0!r}`".format(__version__)) + print("Pipenv version: `{0!r}`".format(pipenv.__version__)) print("") print("Pipenv location: `{0!r}`".format(os.path.dirname(pipenv.__file__))) print("") print("Python location: `{0!r}`".format(sys.executable)) print("") - print("Other Python installations in `PATH`:") + print("Python installations found:") print("") + finder = pythonfinder.Finder(system=False, global_search=True) python_paths = finder.find_all_python_versions() for python in python_paths: - python_version = python.py_version.version - python_path = python.path.as_posix() - print(" - `{0}`: `{1}`".format(python_version, python_path)) + print(" - `{}`: `{}`".format(python.py_version.version, python.path)) print("") print("PEP 508 Information:") print("") print("```") - pprint(lookup) + pprint.pprint(lookup) print("```") print("") print("System environment variables:")