[CalendarServer-changes] [1333] CalendarServer/branches/users/dreid/new-twisted/lib-patches/Twisted/ twisted.web2.iweb.patch

[source_changes at macosforge.org]

Revision: 1333
          http://trac.macosforge.org/projects/calendarserver/changeset/1333
Author:   dreid at apple.com
Date:     2007-03-06 11:32:14 -0800 (Tue, 06 Mar 2007)

Log Message:
-----------
Already applied

Removed Paths:
-------------
    CalendarServer/branches/users/dreid/new-twisted/lib-patches/Twisted/twisted.web2.iweb.patch

Deleted: CalendarServer/branches/users/dreid/new-twisted/lib-patches/Twisted/twisted.web2.iweb.patch
===================================================================
--- CalendarServer/branches/users/dreid/new-twisted/lib-patches/Twisted/twisted.web2.iweb.patch	2007-03-06 19:30:30 UTC (rev 1332)
+++ CalendarServer/branches/users/dreid/new-twisted/lib-patches/Twisted/twisted.web2.iweb.patch	2007-03-06 19:32:14 UTC (rev 1333)
@@ -1,32 +0,0 @@
-Index: twisted/web2/iweb.py
-===================================================================
---- twisted/web2/iweb.py	(revision 18545)
-+++ twisted/web2/iweb.py	(working copy)
-@@ -41,14 +41,23 @@
-         """
- 
- # Is there a better way to do this than this funky extra class?
-+NotSpecified = object()
- class SpecialAdaptInterfaceClass(interface.InterfaceClass):
-     # A special adapter for IResource to handle the extra step of adapting
-     # from IOldNevowResource-providing resources.
--    def __call__(self, other, alternate=None):
--        result = super(SpecialAdaptInterfaceClass, self).__call__(other, alternate)
--        if result is not alternate:
--            return result
-+    def __call__(self, other, alternate=NotSpecified):
-+        if alternate == NotSpecified:
-+            try:
-+                return super(SpecialAdaptInterfaceClass, self).__call__(other)
-+            except TypeError:
-+                pass
-+        else:
-+            result = super(SpecialAdaptInterfaceClass, self).__call__(other, alternate)
-+            if result is not alternate:
-+                return result
-         
-+        if alternate == NotSpecified:
-+            return IOldNevowResource(other)
-         result = IOldNevowResource(other, alternate)
-         if result is not alternate:
-             return IResource(result)

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