From e025d4aa794ba7ca12bbef3e39c4b33ce88c5ede Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Fri, 9 Mar 2018 09:46:34 -0500 Subject: [PATCH] get both fancier and less fancy at the same time Signed-off-by: Kenneth Reitz --- pipenv/patched/piptools/repositories/pypi.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pipenv/patched/piptools/repositories/pypi.py b/pipenv/patched/piptools/repositories/pypi.py index d6d8c6c9..cda890e1 100755 --- a/pipenv/patched/piptools/repositories/pypi.py +++ b/pipenv/patched/piptools/repositories/pypi.py @@ -163,15 +163,20 @@ class PyPIRepository(BaseRepository): def get_dependencies(self, ireq): - legacy_results = self.get_legacy_dependencies(ireq) + json_results = set() + if self.use_json: try: json_results = self.get_json_dependencies(ireq) - legacy_results.update(json_results) except TypeError: - pass + json_results = set() - return legacy_results + try: + legacy_results = self.get_legacy_dependencies(ireq) + except Exception: + legacy_results = set() + + return json_results | legacy_results def get_legacy_dependencies(self, ireq): """