use standard json module

[plcapi.git] / PLC / API.py

diff --git a/PLC/API.py b/PLC/API.py
index 359e955..6518253 100644 (file)
--- a/PLC/API.py
+++ b/PLC/API.py
@@ -13,18 +13,6 @@ import traceback
 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 
 
 # See "2.2 Characters" in the XML specification:
 #
@@ -143,24 +131,21 @@ 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()
 
+        if getattr(self.config, "PLC_NETCONFIG_ENABLED", False):
+            from aspects.netconfigaspects import apply_netconfig_aspect
+            apply_netconfig_aspect()
 
         # Enable Caching. Only for GetSlivers for the moment.
         # TODO: we may consider to do this in an aspect like the ones above.
         try:
             if self.config.PLC_GETSLIVERS_CACHE:
-                getslivers_cache = true
+                getslivers_cache = True
         except AttributeError:
-            getslivers_cache = false
+            getslivers_cache = False
 
         if getslivers_cache:
             os.environ['DJANGO_SETTINGS_MODULE']='plc_django_settings'