X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=PLC%2FAPI.py;h=783463efb3df94dcb1f11f775028a09c5191efa3;hb=d316abf4bdb070ea1acf6be4b262c86a055b6ac2;hp=db4840552a215aa2e037a05d797dd0f003d5138d;hpb=b909e24a306d095a0df0ed8b2574ebde3842f77e;p=plcapi.git

diff --git a/PLC/API.py b/PLC/API.py
index db48405..783463e 100644
--- a/PLC/API.py
+++ b/PLC/API.py
@@ -5,14 +5,72 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 #
 # Copyright (C) 2004-2006 The Trustees of Princeton University
-# $Id: API.py,v 1.3 2006/10/03 19:24:31 mlhuang Exp $
+# $Id: API.py,v 1.6 2006/10/27 18:57:32 mlhuang Exp $
 #
 
 import sys
 import traceback
+import string
 
 import xmlrpclib
 
+# See "2.2 Characters" in the XML specification:
+#
+# #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
+# avoiding
+# [#x7F-#x84], [#x86-#x9F], [#xFDD0-#xFDDF]
+
+invalid_xml_ascii = map(chr, range(0x0, 0x8) + [0xB, 0xC] + range(0xE, 0x1F))
+xml_escape_table = string.maketrans("".join(invalid_xml_ascii), "?" * len(invalid_xml_ascii))
+
+def xmlrpclib_escape(s, replace = string.replace):
+    """
+    xmlrpclib does not handle invalid 7-bit control characters. This
+    function augments xmlrpclib.escape, which by default only replaces
+    '&', '<', and '>' with entities.
+    """
+
+    # This is the standard xmlrpclib.escape function
+    s = replace(s, "&", "&amp;")
+    s = replace(s, "<", "&lt;")
+    s = replace(s, ">", "&gt;",)
+
+    # Replace invalid 7-bit control characters with '?'
+    return s.translate(xml_escape_table)
+
+def xmlrpclib_dump(self, value, write):
+    """
+    xmlrpclib cannot marshal instances of subclasses of built-in
+    types. This function overrides xmlrpclib.Marshaller.__dump so that
+    any value that is an instance of one of its acceptable types is
+    marshalled as that type.
+
+    xmlrpclib also cannot handle invalid 7-bit control characters. See
+    above.
+    """
+
+    # Use our escape function
+    args = [self, value, write]
+    if isinstance(value, (str, unicode)):
+        args.append(xmlrpclib_escape)
+
+    try:
+        # Try for an exact match first
+        f = self.dispatch[type(value)]
+    except KeyError:
+        # Try for an isinstance() match
+        for Type, f in self.dispatch.iteritems():
+            if isinstance(value, Type):
+                f(*args)
+                return
+        raise TypeError, "cannot marshal %s objects" % type(value)
+    else:
+        f(*args)
+
+# You can't hide from me!
+xmlrpclib.Marshaller._Marshaller__dump = xmlrpclib_dump
+
+# SOAP support is optional
 try:
     import SOAPpy
     from SOAPpy.Parser import parseSOAPRPC
@@ -23,7 +81,6 @@ except ImportError:
     SOAPpy = None
 
 from PLC.Config import Config
-from PLC.PostgreSQL import PostgreSQL
 from PLC.Faults import *
 import PLC.Methods
 
@@ -42,6 +99,7 @@ class PLCAPI:
 
         # Initialize database connection
         if self.config.PLC_DB_TYPE == "postgresql":
+            from PLC.PostgreSQL import PostgreSQL
             self.db = PostgreSQL(self)
         else:
             raise PLCAPIError, "Unsupported database type " + config.PLC_DB_TYPE