cleanup accessors

[plcapi.git] / PLC / API.py

diff --git a/PLC/API.py b/PLC/API.py
index 8d95f8e..191720d 100644 (file)
--- a/PLC/API.py
+++ b/PLC/API.py
@@ -5,8 +5,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 #
 # Copyright (C) 2004-2006 The Trustees of Princeton University
-# $Id$
-# $URL$
 #
 
 import sys
@@ -15,6 +13,17 @@ 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:
 #
@@ -130,11 +139,14 @@ class PLCAPI:
         else:
             raise PLCAPIError, "Unsupported database type " + self.config.PLC_DB_TYPE
 
-        # Aspects modify the API injecting code before/after method
-        # calls. As of now we only have aspects for OMF integration,
-        # that's why we enable aspects only if PLC_OMF is set to true.
+        # 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_aspects; apply_aspects()
+            from aspects import apply_omf_aspect
+            apply_omf_aspect()
 
 
     def callable(self, method):
@@ -213,12 +225,12 @@ class PLCAPI:
         """
         Handle a JSON request 
         """
-        method, args = simplejson.loads(data)
+        method, args = json.loads(data)
         try:
             result = self.call(source, method, *args)
         except Exception, e:
             result = str(e)
        
-        return simplejson.dumps(result) 
+        return json.dumps(result)