Merge c3cc46e into 68633d3

biosustain · Nov 15, 2018 · 8d84039 · 8d84039
2 parents 68633d3 + c3cc46e
commit 8d84039
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/potion_client/converter.py b/potion_client/converter.py
@@ -1,6 +1,11 @@
 import calendar
 from functools import partial
-from json import JSONEncoder, JSONDecoder
+
+try:
+    from simplejson import JSONEncoder, JSONDecoder
+except ImportError:
+    from json import JSONEncoder, JSONDecoder
+
 from datetime import date, datetime
 from six.moves.urllib.parse import urljoin
 import six

diff --git a/potion_client/links.py b/potion_client/links.py
@@ -1,4 +1,8 @@
-import json
+try:
+    import simplejson as json
+except ImportError:
+    import json
+
 import re
 
 from requests import Request
@@ -118,4 +122,4 @@ def __call__(self, *arg, **params):
             return PaginatedList(self, params)
 
         response, response_data = self.make_request(data, params)
-        return response_data
+        return response_data