Actually, we really only do need to catch ValueError. James pointed o…

…ut that JSONDecodeError inherits from ValueError. Tests continue to pass.

boto/cloudsearch/search.py

@@ -36,15 +36,6 @@ class CommitMismatchError(Exception):
     pass
 
 
-try:
-    from simplejson import JSONDecodeError
-except ImportError:
-    class FakeJSONDecodeError(Exception):
-        pass
-
-    JSONDecodeError = FakeJSONDecodeError
-
-
 class SearchResults(object):
     def __init__(self, **attrs):
         self.rid = attrs['info']['rid']
@@ -299,7 +290,7 @@ def __call__(self, query):
         r = requests.get(url, params=params)
         try:
             data = json.loads(r.content)
-        except (JSONDecodeError, ValueError), e:
+        except ValueError, e:
             if r.status_code == 403:
                 msg = ''
                 import re