Issue #85: Remove Python 2.7 support on Amazon-dash v2.0.0 (fixed Pyt…

…hon 3.4 support)
Nekmo · Sep 4, 2018 · 0008fde · 0008fde
1 parent 46aa593
commit 0008fde
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/amazon_dash/_compat.py b/amazon_dash/_compat.py
@@ -0,0 +1,6 @@
+
+try:
+    from json import JSONDecodeError
+except ImportError:
+    # Python<3.5 support
+    JSONDecodeError = ValueError
diff --git a/amazon_dash/confirmations.py b/amazon_dash/confirmations.py
@@ -2,7 +2,7 @@
 from requests import RequestException
 
 from amazon_dash.exceptions import InvalidConfig, ConfirmationError
-from json import JSONDecodeError
+from ._compat import JSONDecodeError
 
 class ConfirmationBase(object):
     name = None

diff --git a/amazon_dash/execute.py b/amazon_dash/execute.py
@@ -4,7 +4,7 @@
 import sys
 import copy
 import subprocess
-from json import JSONDecodeError
+from ._compat import JSONDecodeError
 from urllib.parse import urlparse
 
 from requests import request, RequestException

diff --git a/amazon_dash/tests/_compat.py b/amazon_dash/tests/_compat.py
@@ -2,4 +2,5 @@
 try:
     from mock import patch, Mock, mock_open
 except ImportError:
+    # Python<3.6 support
     from unittest.mock import patch, Mock, mock_open