Introduce compat.py

lovelydinosaur · lovelydinosaur · commit 6bab0248400d · 2018-02-15T10:41:27.000Z
diff --git a/coreapi_cli/auth.py b/coreapi_cli/auth.py
@@ -1,13 +1,6 @@
+from coreapi_cli.compat import urlparse
 from requests.auth import AuthBase
 
-try:
-    # Python 2
-    import urlparse
-
-except ImportError:
-    # Python 3
-    import urllib.parse as urlparse
-
 
 class DomainCredentials(AuthBase):
     allow_cookies = False
diff --git a/coreapi_cli/compat.py b/coreapi_cli/compat.py
@@ -0,0 +1,16 @@
+import json
+
+try:
+    # Python 3
+    JSONDecodeError = json.decoder.JSONDecodeError
+except AttributeError:
+    # Python 2
+    JSONDecodeError = ValueError
+
+
+try:
+    # Python 2
+    import urlparse    # noqa
+except ImportError:
+    # Python 3
+    import urllib.parse as urlparse  # noqa
diff --git a/coreapi_cli/main.py b/coreapi_cli/main.py
@@ -2,6 +2,7 @@
 from coreapi_cli import __version__ as client_version
 from coreapi_cli import codec_plugins
 from coreapi_cli.auth import DomainCredentials
+from coreapi_cli.compat import JSONDecodeError
 from coreapi_cli.display import display
 from coreapi_cli.debug import DebugSession
 from coreapi_cli.history import History, dump_history, load_history
@@ -47,7 +48,7 @@ def coerce_key_types(doc, keys):
         if isinstance(active, coreapi.Array):
             try:
                 key = int(key)
-            except:
+            except ValueError:
                 pass
 
         # Descend through the document, so we can correctly identify
@@ -269,7 +270,7 @@ def parse_params(ctx, param, tokens):
 
         try:
             pair = (field, json.loads(value))
-        except:
+        except JSONDecodeError:
             if value.startswith('{') or value.startswith('['):
                 # Guard against malformed composite objects being treated as strings.
                 raise click.BadParameter('Unclear if parameter "%s" should be interperted as a string or data. Use --data or --string instead.' % field)
@@ -289,7 +290,7 @@ def parse_json(ctx, param, tokens):
 
         try:
             pair = (field, json.loads(value))
-        except:
+        except JSONDecodeError:
             raise click.BadParameter('Could not parse value for data argument "%s"' % field)
         ret.append(pair)
 
