[CalendarServer-changes] [5351] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 5351
          http://trac.macosforge.org/projects/calendarserver/changeset/5351
Author:   wsanchez at apple.com
Date:     2010-03-18 17:42:56 -0700 (Thu, 18 Mar 2010)
Log Message:
-----------
Patch HEAD / HTTP/1.1

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/extensions.py
    CalendarServer/trunk/twistedcaldav/resource.py

Modified: CalendarServer/trunk/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/extensions.py	2010-03-19 00:36:28 UTC (rev 5350)
+++ CalendarServer/trunk/twistedcaldav/extensions.py	2010-03-19 00:42:56 UTC (rev 5351)
@@ -34,8 +34,11 @@
 import cgi
 import time
 
-from twisted.internet.defer import succeed, DeferredList, inlineCallbacks, returnValue
+from twisted.internet.defer import succeed, DeferredList
+from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.cred.error import LoginFailed, UnauthorizedLogin
+
+import twext.web2.server
 from twext.web2 import responsecode
 from twext.web2.auth.wrapper import UnauthorizedResponse
 from twext.web2.http import HTTPError, Response, RedirectResponse
@@ -57,6 +60,7 @@
 
 from twext.python.log import Logger, LoggingMixIn
 
+import twistedcaldav
 from twistedcaldav import customxml
 from twistedcaldav.customxml import calendarserver_namespace
 from twistedcaldav.util import Alternator, printTracebacks
@@ -67,6 +71,17 @@
 log = Logger()
 
 
+if twistedcaldav.__version__:
+    twext.web2.server.VERSION = "CalendarServer/%s %s" % (
+        twistedcaldav.__version__.replace(" ", ""),
+        twext.web2.server.VERSION,
+    )
+else:
+    twext.web2.server.VERSION = "CalendarServer/? %s" % (
+        twext.web2.server.VERSION,
+    )
+
+
 class SudoSACLMixin (object):
     """
     Mixin class to let DAVResource, and DAVFile subclasses know about
@@ -437,6 +452,7 @@
         log.info("%s %s %s" % (request.method, urllib.unquote(request.uri), "HTTP/%s.%s" % request.clientproto))
         return super(DAVResource, self).renderHTTP(request)
 
+
     http_REPORT = http_REPORT
 
 

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2010-03-19 00:36:28 UTC (rev 5350)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2010-03-19 00:42:56 UTC (rev 5351)
@@ -40,7 +40,7 @@
 from twext.web2.dav.http import ErrorResponse
 
 from twisted.internet import reactor
-from twisted.internet.defer import Deferred, maybeDeferred, succeed
+from twisted.internet.defer import Deferred, succeed
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twext.web2 import responsecode
 from twext.web2.dav import davxml
@@ -52,11 +52,8 @@
 from twext.web2.dav.util import joinURL, parentForURL, unimplemented, normalizeURL
 from twext.web2.http import HTTPError, RedirectResponse, StatusResponse, Response
 from twext.web2.http_headers import MimeType
-from twext.web2.iweb import IResponse
 from twext.web2.stream import MemoryStream
-import twext.web2.server
 
-import twistedcaldav
 from twistedcaldav import caldavxml, customxml
 from twistedcaldav import carddavxml
 from twistedcaldav.carddavxml import carddav_namespace
@@ -72,12 +69,6 @@
 from twistedcaldav.vcard import Component as vComponent
 
 
-if twistedcaldav.__version__:
-    serverVersion = twext.web2.server.VERSION + " TwistedCardDAV/" + twistedcaldav.__version__
-else:
-    serverVersion = twext.web2.server.VERSION + " TwistedCardDAV/?"
-
-
 class CalDAVComplianceMixIn(object):
     def davComplianceClasses(self):
         return (
@@ -140,20 +131,7 @@
 
         return super(CalDAVResource, self).render(request)
 
-    def renderHTTP(self, request):
-        response = maybeDeferred(super(CalDAVResource, self).renderHTTP, request)
 
-        def setHeaders(response):
-            response = IResponse(response)
-            response.headers.setHeader("server", serverVersion)
-
-            return response
-
-        response.addCallback(setHeaders)
-
-        return response
-
-
     ##
     # WebDAV
     ##
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100318/22a065b7/attachment.html>