[CalendarServer-changes] [3487] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch

[source_changes at macosforge.org]

Revision: 3487
          http://trac.macosforge.org/projects/calendarserver/changeset/3487
Author:   cdaboo at apple.com
Date:     2008-12-09 10:43:27 -0800 (Tue, 09 Dec 2008)
Log Message:
-----------
Minor tweak to fix tests.

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch	2008-12-09 18:38:26 UTC (rev 3486)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch	2008-12-09 18:43:27 UTC (rev 3487)
@@ -20,7 +20,7 @@
          if kw.has_key('site'):
              self.site = kw['site']
              del kw['site']
-@@ -150,17 +154,33 @@
+@@ -150,17 +154,36 @@
              self._initialprepath = kw['prepathuri']
              del kw['prepathuri']
  
@@ -32,7 +32,10 @@
          self.files = {}
          self.resources = []
          http.Request.__init__(self, *args, **kw)
-+        self.serverInstance = self.chanRequest.transport.server.port
++        try:
++            self.serverInstance = self.chanRequest.transport.server.port
++        except AttributeError:
++            self.serverInstance = "Unknown"
  
 -    def addResponseFilter(self, f, atEnd=False):
 +    def addResponseFilter(self, filter, atEnd=False, onlyOnce=False):
@@ -57,7 +60,7 @@
  
      def unparseURL(self, scheme=None, host=None, port=None,
                     path=None, params=None, querystring=None, fragment=None):
-@@ -265,6 +285,7 @@
+@@ -265,6 +288,7 @@
          
          d = defer.Deferred()
          d.addCallback(self._getChild, self.site.resource, self.postpath)
@@ -65,7 +68,7 @@
          d.addCallback(lambda res, req: res.renderHTTP(req), self)
          d.addCallback(self._cbFinishRender)
          d.addErrback(self._processingFailed)
-@@ -321,7 +342,6 @@
+@@ -321,7 +345,6 @@
          if newpath is StopTraversal:
              # We need to rethink how to do this.
              #if newres is res:
@@ -73,7 +76,7 @@
                  return res
              #else:
              #    raise ValueError("locateChild must not return StopTraversal with a resource other than self.")
-@@ -337,7 +357,6 @@
+@@ -337,7 +360,6 @@
                  self.prepath.append(self.postpath.pop(0))
  
          child = self._getChild(None, newres, newpath, updatepaths=updatepaths)
@@ -81,7 +84,7 @@
  
          return child
  
-@@ -347,6 +366,7 @@
+@@ -347,6 +369,7 @@
          """
          Remember the URL of a visited resource.
          """
@@ -89,7 +92,7 @@
          self._urlsByResource[resource] = url
          return resource
  
-@@ -386,7 +406,8 @@
+@@ -386,7 +409,8 @@
              The contained response will have a status code of
              L{responsecode.BAD_REQUEST}.
          """
@@ -99,7 +102,7 @@
  
          #
          # Parse the URL
-@@ -407,9 +428,13 @@
+@@ -407,9 +431,13 @@
                  "URL is not on this site (%s://%s/): %s" % (scheme, self.headers.getHeader("host"), url)
              ))
  
@@ -115,7 +118,7 @@
  
          def notFound(f):
              f.trap(http.HTTPError)
-@@ -417,7 +442,7 @@
+@@ -417,7 +445,7 @@
                  return f
              return None
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081209/24aba739/attachment-0001.html>