Ticket #3219: xmlrpc_datetime_r28820.diff

twisted/web/xmlrpc.py

@@ -92 +92 @@
     separator = '.'
     allowedMethods = ('POST',)
 
-    def __init__(self, allowNone=False):
+    def __init__(self, allowNone=False, useDateTime=False):
         resource.Resource.__init__(self)
         self.subHandlers = {}
         self.allowNone = allowNone
+        self.useDateTime = useDateTime
 
     def putSubHandler(self, prefix, handler):
         self.subHandlers[prefix] = handler
@@ -110 +111 @@
         request.content.seek(0, 0)
         request.setHeader("content-type", "text/xml")
         try:
-            args, functionPath = xmlrpclib.loads(request.content.read())
+            args, functionPath = xmlrpclib.loads(request.content.read(),
+                use_datetime=self.useDateTime)
         except Exception, e:
             f = Fault(self.FAILURE, "Can't deserialize input: %s" % (e,))
             self._cbRender(f, request)
@@ -303 +305 @@
     protocol = QueryProtocol
 
     def __init__(self, path, host, method, user=None, password=None,
-                 allowNone=False, args=(), canceller=None):
+                 allowNone=False, args=(), canceller=None, useDateTime=False):
         """
         @type path: C{str}
         @param path: The path portion of the URL to which to post method calls.
@@ -338 +340 @@
         self.payload = payloadTemplate % (method,
             xmlrpclib.dumps(args, allow_none=allowNone))
         self.deferred = defer.Deferred(canceller)
+        self.useDateTime = useDateTime
 
     def parseResponse(self, contents):
         if not self.deferred:
             return
         try:
-            response = xmlrpclib.loads(contents)[0][0]
+            response = xmlrpclib.loads(contents,
+                use_datetime=self.useDateTime)[0][0]
         except:
             deferred, self.deferred = self.deferred, None
             deferred.errback(failure.Failure())
@@ -378 +382 @@
     """
     queryFactory = _QueryFactory
 
-    def __init__(self, url, user=None, password=None, allowNone=False):
+    def __init__(self, url, user=None, password=None, allowNone=False,
+                 useDateTime=False):
         """
         @type url: C{str}
         @param url: The URL to which to post method calls.  Calls will be made
@@ -428 +433 @@
         if password is not None:
             self.password = password
         self.allowNone = allowNone
+        self.useDateTime = useDateTime
 
     def callRemote(self, method, *args):
         """
@@ -447 +453 @@
             connector.disconnect()
         factory = self.queryFactory(
             self.path, self.host, method, self.user,
-            self.password, self.allowNone, args, cancel)
+            self.password, self.allowNone, args, cancel, self.useDateTime)
         if self.secure:
             from twisted.internet import ssl
             connector = reactor.connectSSL(self.host, self.port or 443,