remove old json stuff

1 files changed, 15 insertions, 30 deletions

diff --git a/utils.py b/utils.py
index 766ed2d..d593683 100644
--- a/utils.py
+++ b/utils.py
@@ -14,19 +14,10 @@ import os
 from gi.repository import GdkPixbuf
 import subprocess
 from StringIO import StringIO
-try:
-    OLD_SUGAR_SYSTEM = False
-    import json
-    json.dumps
-    from json import load as jload
-    from json import dump as jdump
-except (ImportError, AttributeError):
-    try:
-        import simplejson as json
-        from simplejson import load as jload
-        from simplejson import dump as jdump
-    except:
-        OLD_SUGAR_SYSTEM = True
+import json
+json.dumps
+from json import load as jload
+from json import dump as jdump
 
 
 XO1 = 'xo1'
@@ -69,28 +60,22 @@ def _get_dmi(node):
 
 def json_load(text):
     ''' Load JSON data using what ever resources are available. '''
-    if OLD_SUGAR_SYSTEM is True:
-        listdata = json.read(text)
-    else:
-        io = StringIO(text)
-        try:
-            listdata = jload(io)
-        except ValueError:
-            # assume that text is ascii list
-            listdata = text.split()
-            for i, value in enumerate(listdata):
-                listdata[i] = int(value)
+    io = StringIO(text)
+    try:
+        listdata = jload(io)
+    except ValueError:
+        # assume that text is ascii list
+        listdata = text.split()
+        for i, value in enumerate(listdata):
+            listdata[i] = int(value)
     return listdata
 
 
 def json_dump(data):
     ''' Save data using available JSON tools. '''
-    if OLD_SUGAR_SYSTEM is True:
-        return json.write(data)
-    else:
-        _io = StringIO()
-        jdump(data, _io)
-        return _io.getvalue()
+    _io = StringIO()
+    jdump(data, _io)
+    return _io.getvalue()
 
 
 def get_path(activity, path):