ujson import fixed

not sure how to get ciso8601 to work #122

betfairlightweight/compat.py

@@ -1,4 +1,5 @@
 import sys
+import datetime
 
 
 _ver = sys.version_info
@@ -25,3 +26,14 @@ class FileNotFoundError(OSError):
     basestring = (str, bytes)
     numeric_types = (int, float)
     integer_types = (int,)
+
+try:
+    import ujson as json
+except ImportError:
+    import json
+
+try:  # todo
+    import ciso8601
+    parse_datetime = ciso8601.parse_datetime_unaware
+except ImportError:
+    parse_datetime = datetime.datetime.strptime(None, "%Y-%m-%dT%H:%M:%S.%fZ")

betfairlightweight/endpoints/baseendpoint.py

@@ -1,10 +1,10 @@
 import requests
 import datetime
-import ujson as json
 from requests import ConnectionError
 
 from ..exceptions import APIError
 from ..utils import check_status_code
+from ..compat import json
 
 # monkeypatching requests
 # https://github.com/kennethreitz/requests/issues/1595

betfairlightweight/endpoints/scores.py

@@ -1,5 +1,3 @@
-import datetime
-
 from .baseendpoint import BaseEndpoint
 from .. import resources
 from ..utils import clean_locals

betfairlightweight/resources/baseresource.py

@@ -1,10 +1,10 @@
 import datetime
 import ciso8601
-import ujson as json
 
 from ..compat import (
     basestring,
     integer_types,
+    json,
 )
 
 

betfairlightweight/streaming/betfairstream.py

@@ -1,4 +1,3 @@
-import ujson as json
 import threading
 import socket
 import ssl
@@ -9,7 +8,10 @@
     SocketError,
     ListenerError,
 )
-from ..compat import is_py3
+from ..compat import (
+    is_py3,
+    json,
+)
 
 
 class BetfairStream(object):

betfairlightweight/streaming/listener.py

@@ -1,4 +1,4 @@
-import json
+import json  # ujson causes issues
 import logging
 
 from .stream import (