[CalendarServer-changes] [3843] CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/ Twisted/twisted.web2.server.patch

[source_changes at macosforge.org]

Revision: 3843
          http://trac.macosforge.org/projects/calendarserver/changeset/3843
Author:   exarkun at twistedmatrix.com
Date:     2009-03-12 10:29:13 -0700 (Thu, 12 Mar 2009)
Log Message:
-----------
Update to apply without fuzz

Modified Paths:
--------------
    CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.server.patch

Modified: CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.server.patch
===================================================================
--- CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.server.patch	2009-03-12 17:28:17 UTC (rev 3842)
+++ CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.server.patch	2009-03-12 17:29:13 UTC (rev 3843)
@@ -1,8 +1,8 @@
 Index: twisted/web2/server.py
 ===================================================================
---- twisted/web2/server.py	(revision 19773)
+--- twisted/web2/server.py	(revision 26342)
 +++ twisted/web2/server.py	(working copy)
-@@ -26,6 +26,7 @@
+@@ -24,6 +24,7 @@
  from twisted.web2 import http_headers
  from twisted.web2.filter.range import rangefilter
  from twisted.web2 import error
@@ -10,9 +10,9 @@
  
  from twisted.web2 import version as web2_version
  from twisted import __version__ as twisted_version
-@@ -143,6 +144,9 @@
+@@ -171,6 +172,9 @@
                         error.defaultErrorHandler, defaultHeadersFilter]
-     
+ 
      def __init__(self, *args, **kw):
 +        
 +        self.initTime = time.time()
@@ -20,7 +20,7 @@
          if kw.has_key('site'):
              self.site = kw['site']
              del kw['site']
-@@ -150,17 +154,36 @@
+@@ -178,17 +182,36 @@
              self._initialprepath = kw['prepathuri']
              del kw['prepathuri']
  
@@ -60,15 +60,15 @@
  
      def unparseURL(self, scheme=None, host=None, port=None,
                     path=None, params=None, querystring=None, fragment=None):
-@@ -265,6 +288,7 @@
-         
+@@ -293,6 +316,7 @@
+ 
          d = defer.Deferred()
          d.addCallback(self._getChild, self.site.resource, self.postpath)
 +        d.addCallback(self._rememberResource, "/" + "/".join(quote(s) for s in self.postpath))
          d.addCallback(lambda res, req: res.renderHTTP(req), self)
          d.addCallback(self._cbFinishRender)
          d.addErrback(self._processingFailed)
-@@ -321,7 +345,6 @@
+@@ -349,7 +373,6 @@
          if newpath is StopTraversal:
              # We need to rethink how to do this.
              #if newres is res:
@@ -76,7 +76,7 @@
                  return res
              #else:
              #    raise ValueError("locateChild must not return StopTraversal with a resource other than self.")
-@@ -337,7 +360,6 @@
+@@ -365,7 +388,6 @@
                  self.prepath.append(self.postpath.pop(0))
  
          child = self._getChild(None, newres, newpath, updatepaths=updatepaths)
@@ -84,7 +84,7 @@
  
          return child
  
-@@ -347,6 +369,7 @@
+@@ -375,6 +397,7 @@
          """
          Remember the URL of a visited resource.
          """
@@ -92,7 +92,7 @@
          self._urlsByResource[resource] = url
          return resource
  
-@@ -386,7 +409,8 @@
+@@ -414,7 +437,8 @@
              The contained response will have a status code of
              L{responsecode.BAD_REQUEST}.
          """
@@ -102,7 +102,7 @@
  
          #
          # Parse the URL
-@@ -407,9 +431,13 @@
+@@ -435,9 +459,13 @@
                  "URL is not on this site (%s://%s/): %s" % (scheme, self.headers.getHeader("host"), url)
              ))
  
@@ -118,7 +118,7 @@
  
          def notFound(f):
              f.trap(http.HTTPError)
-@@ -417,7 +445,7 @@
+@@ -445,7 +473,7 @@
                  return f
              return None
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090312/2f4fa6f7/attachment-0001.html>