json is now guaranteed to be in stdlib, so no need for simplejson

Those were the days…

Author: alexdutton

sword2/compatible_libs.py

@@ -5,18 +5,14 @@
 Provides the module with access to certain libraries that have more than one suitable implementation, in a optimally
 degredating manner.
 
-Provides - `etree` and `json`
+Provides - `etree`
 
 `etree` can be from any of the following, if found in the local environment:
     `lxml`
     `xml.etree`
     `elementtree`
     `cElementTree`
 
-`json` can be from any of the following:
-    `json` (python >= 2.6)
-    `simplejson`
-    
 If no suitable library is found, then it will pass back `None`
 """
 
@@ -39,12 +35,3 @@
             except ImportError:
                 cl_l.error("Couldn't find a suitable ElementTree library to use in this environment.")
                 etree = None
-
-try:
-    import json
-except ImportError:
-    try:
-        import simplejson as json
-    except ImportError:
-        cl_l.error("Couldn't find a suitable simplejson-like library to use to serialise JSON")
-        json = None

sword2/transaction_history.py

@@ -5,12 +5,14 @@
 Provides a class to hold the `sword2.Connection` transaction history and give simple means for export (JSON) and reporting.
 """
 
-from .sword2_logging import logging
-
+import json
 from datetime import datetime
 
+from .sword2_logging import logging
+
 th_l = logging.getLogger(__name__)
 
+
 class Transaction_History(list):
     def log(self, event_type, **kw):
         self.append({'type':event_type,
@@ -28,18 +30,10 @@ def __str__(self):
         return "\n".join(_s)
 
     def to_json(self):
-        from .compatible_libs import json
-        if json:
-            th_l.debug("Attempting to dump %s history items to JSON" % len(self))
-            return json.dumps(self)
-        else:
-            th_l.error("Cannot procede with converting the transaction history to JSON")
+        th_l.debug("Attempting to dump %s history items to JSON" % len(self))
+        return json.dumps(self)
 
     def to_pretty_json(self):
-        from .compatible_libs import json
-        if json:
-            th_l.debug("Attempting to dump %s history items to indented, readable JSON" % len(self))
-            return json.dumps(self, indent=True)
-        else:
-            th_l.error("Cannot procede with converting the transaction history to JSON")
+        th_l.debug("Attempting to dump %s history items to indented, readable JSON" % len(self))
+        return json.dumps(self, indent=True)