use standard json module

[plcapi.git] / PLC / API.py

diff --git a/PLC/API.py b/PLC/API.py
index 201de2d..6518253 100644 (file)
--- a/PLC/API.py
+++ b/PLC/API.py
@@ -13,20 +13,6 @@ import traceback
 import string
 
 import xmlrpclib
-import 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:
 #
@@ -145,12 +131,6 @@ class PLCAPI:
         # Aspects modify the API by injecting code before, after or
         # around method calls. -- http://github.com/baris/pyaspects/blob/master/README
         # 
-        # As of now we only have aspects for OMF integration, that's
-        # why we enable aspects only if PLC_OMF is set to true.
-        if self.config.PLC_OMF_ENABLED:
-            from aspects import apply_omf_aspect
-            apply_omf_aspect()
-        
         if self.config.PLC_RATELIMIT_ENABLED:
             from aspects import apply_ratelimit_aspect
             apply_ratelimit_aspect()