From 0291c03054fefc9e04f5842ec4ca9d43fa81bf22 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.org>
Date: Thu, 7 Sep 2017 12:30:56 -0400
Subject: [PATCH] fix python 2 regression

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
---
 HISTORY.txt           | 2 ++
 pipenv/__version__.py | 2 +-
 pipenv/utils.py       | 4 +---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HISTORY.txt b/HISTORY.txt
index 6e17ba37..8d59573f 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -1,3 +1,5 @@
+6.0.2:
+ - Fix Python 2 regression.
 6.0.1:
  - Minor (major) bug fix.
 6.0.0:
diff --git a/pipenv/__version__.py b/pipenv/__version__.py
index df3816ca..9a3bd6e6 100644
--- a/pipenv/__version__.py
+++ b/pipenv/__version__.py
@@ -3,4 +3,4 @@
 #  //___/ / / / //___/ / //       //   / /  || / /
 # //       / / //       ((____   //   / /   ||/ /
 
-__version__ = '6.0.1'
+__version__ = '6.0.2'
diff --git a/pipenv/utils.py b/pipenv/utils.py
index fb644ddf..5c4e0933 100644
--- a/pipenv/utils.py
+++ b/pipenv/utils.py
@@ -58,8 +58,6 @@ def resolve_deps(deps, sources=None, verbose=False, hashes=False):
         name = pep423_name(result.name)
         version = six.u(str(result.specifier)).replace('==', '')
 
-        from json.decoder import JSONDecodeError
-
         if hashes:
             try:
                 collected_hashes = []
@@ -70,7 +68,7 @@ def resolve_deps(deps, sources=None, verbose=False, hashes=False):
                 collected_hashes = ['sha256:' + s for s in collected_hashes]
 
                 results.append({'name': name, 'version': version, 'hashes': collected_hashes})
-            except JSONDecodeError:
+            except ValueError:
                 results.append({'name': name, 'version': version})
         else:
             results.append({'name': name, 'version': version})