From 425517806cf116f819af883cde2733e5ff202b60 Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Wed, 10 Oct 2018 00:38:39 -0400 Subject: [PATCH] Remove NoneType resuts from dist search Signed-off-by: Dan Ryan --- pipenv/project.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pipenv/project.py b/pipenv/project.py index 1a371fda..5dcce7a4 100644 --- a/pipenv/project.py +++ b/pipenv/project.py @@ -307,17 +307,20 @@ class Project(object): if not location: return dist.location + def dist_is_in_project(self, dist): + prefix = _normalized(self.env_paths["prefix"]) + location = self.locate_dist(dist) + if not location: + return False + return _normalized(location).startswith(prefix) + def get_installed_packages(self): workingset = self.working_set - prefix = _normalized(self.env_paths["prefix"]) if self.virtualenv_exists: - packages = [ - pkg for pkg in workingset - if _normalized(self.locate_dist(pkg)).startswith(prefix) - ] - return packages + packages = [pkg for pkg in workingset if self.dist_is_in_project(pkg)] else: - return [pkg for pkg in packages] + packages = [pkg for pkg in packages] + return packages @classmethod def _sanitize(cls, name):