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

[source_changes at macosforge.org]

Revision: 473
          http://trac.macosforge.org/projects/calendarserver/changeset/473
Author:   cdaboo at apple.com
Date:     2006-11-15 13:03:16 -0800 (Wed, 15 Nov 2006)

Log Message:
-----------
Fix unhandled exception.

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	2006-11-15 20:33:54 UTC (rev 472)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch	2006-11-15 21:03:16 UTC (rev 473)
@@ -112,7 +112,7 @@
          #
          # Parse the URL
          #
-@@ -406,19 +422,66 @@
+@@ -406,18 +422,65 @@
                  "URL is not on this site (%s://%s/): %s" % (scheme, self.headers.getHeader("host"), url)
              ))
  
@@ -124,17 +124,15 @@
  
          def notFound(f):
              f.trap(http.HTTPError)
-             if f.response.code != responsecode.NOT_FOUND:
--                raise f
++            if f.value.response.code != responsecode.NOT_FOUND:
 +                return f
-             return None
- 
--        return defer.maybeDeferred(self._getChild, None, self.site.resource, segments, updatepaths=False)
++            return None
++
 +        d = defer.maybeDeferred(self._getChild, None, self.site.resource, segments, updatepaths=False)
 +        d.addCallback(self._rememberResource, path)
 +        d.addErrback(notFound)
 +        return d
- 
++
 +    def locateChildResource(self, parent, child_name):
 +        """
 +        Looks up the child resource with the given name given the parent
@@ -171,15 +169,16 @@
 +
 +        def notFound(f):
 +            f.trap(http.HTTPError)
-+            if f.response.code != responsecode.NOT_FOUND:
+             if f.response.code != responsecode.NOT_FOUND:
+-                raise f
 +                return f
-+            return None
-+
+             return None
+ 
+-        return defer.maybeDeferred(self._getChild, None, self.site.resource, segments, updatepaths=False)
 +        d = defer.maybeDeferred(self._getChild, None, parent, [segment], updatepaths=False)
 +        d.addCallback(self._rememberResource, url)
 +        d.addErrback(notFound)
 +        return d
-+
+ 
      def _processingFailed(self, reason):
          if reason.check(http.HTTPError) is not None:
-             # If the exception was an HTTPError, leave it alone

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061115/2b679a68/attachment.html