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

source_changes at macosforge.org source_changes at macosforge.org
Wed Feb 28 10:54:57 PST 2007


Revision: 1291
          http://trac.macosforge.org/projects/calendarserver/changeset/1291
Author:   dreid at apple.com
Date:     2007-02-28 10:54:57 -0800 (Wed, 28 Feb 2007)

Log Message:
-----------
In twisted trunk

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-02-28 18:50:06 UTC (rev 1290)
+++ CalendarServer/branches/users/dreid/new-twisted/lib-patches/Twisted/twisted.web2.iweb.patch	2007-02-28 18:54:57 UTC (rev 1291)
@@ -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/20070228/d178742d/attachment.html


More information about the calendarserver-changes mailing list