From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 16 Feb 2013 12:58:57 +0000 (+0100)
Subject: cleaup
X-Git-Tag: plcapi-5.2-1~13
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=fb86c618dfd46678b6bac3b82a5ab2bcded45113;p=plcapi.git

cleaup
---

diff --git a/PLC/API.py b/PLC/API.py
index 9f13f38..6cab28e 100644
--- a/PLC/API.py
+++ b/PLC/API.py
@@ -14,17 +14,19 @@ import string
 
 import xmlrpclib
 import simplejson
-try:
-    # Try to use jsonlib before using simpljson. This is a hack to get around
-    # the fact that the version of simplejson avaialble for f8 is slightly 
-    # faster than xmlrpc but not as fast as jsonlib. There is no jsonlib 
-    # pacakge available for f8, so this has to be installed manually and
-    # is not expected to always be available. Remove this once we move away
-    # from f8 based MyPLC's         
-    import jsonlib
-    json = jsonlib
-except:
-    json = simplejson 
+# use this one
+json=simplejson
+#try:
+#    # Try to use jsonlib before using simpljson. This is a hack to get around
+#    # the fact that the version of simplejson available for f8 is slightly 
+#    # faster than xmlrpc but not as fast as jsonlib. There is no jsonlib 
+#    # package available for f8, so this has to be installed manually and
+#    # is not expected to always be available. Remove this once we move away
+#    # from f8 based MyPLC's         
+#    import jsonlib
+#    json = jsonlib
+#except:
+#    json = simplejson 
 
 # See "2.2 Characters" in the XML specification:
 #