[CalendarServer-changes] [2814] CalendarServer/branches/users/cdaboo/implicit-2799/lib-patches/ Twisted

[source_changes at macosforge.org]

Revision: 2814
          http://trac.macosforge.org/projects/calendarserver/changeset/2814
Author:   cdaboo at apple.com
Date:     2008-08-13 08:59:54 -0700 (Wed, 13 Aug 2008)
Log Message:
-----------
Fix tracebacks on unhandled exceptions caused in inlineCallbacks or deferredGenerators so that the result
written to the log file actually indicates where the original exception was raised.

Added Paths:
-----------
    CalendarServer/branches/users/cdaboo/implicit-2799/lib-patches/Twisted/twisted.internet.defer.patch
    CalendarServer/branches/users/cdaboo/implicit-2799/lib-patches/Twisted/twisted.python.failure.patch

Added: CalendarServer/branches/users/cdaboo/implicit-2799/lib-patches/Twisted/twisted.internet.defer.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2799/lib-patches/Twisted/twisted.internet.defer.patch	                        (rev 0)
+++ CalendarServer/branches/users/cdaboo/implicit-2799/lib-patches/Twisted/twisted.internet.defer.patch	2008-08-13 15:59:54 UTC (rev 2814)
@@ -0,0 +1,16 @@
+Index: twisted/internet/defer.py
+===================================================================
+--- twisted/internet/defer.py	(revision 19773)
++++ twisted/internet/defer.py	(working copy)
+@@ -733,7 +733,10 @@
+             deferred.callback(e.value)
+             return deferred
+         except:
+-            deferred.errback()
++            last_failure = None
++            if isinstance(result, failure.Failure):
++                last_failure = result
++            deferred.errback(last_failure)
+             return deferred
+ 
+         if isinstance(result, Deferred):

Added: CalendarServer/branches/users/cdaboo/implicit-2799/lib-patches/Twisted/twisted.python.failure.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2799/lib-patches/Twisted/twisted.python.failure.patch	                        (rev 0)
+++ CalendarServer/branches/users/cdaboo/implicit-2799/lib-patches/Twisted/twisted.python.failure.patch	2008-08-13 15:59:54 UTC (rev 2814)
@@ -0,0 +1,14 @@
+Index: twisted/python/failure.py
+===================================================================
+--- twisted/python/failure.py	(revision 19773)
++++ twisted/python/failure.py	(working copy)
+@@ -325,7 +325,8 @@
+         ]
+ 
+         # added 2003-06-23. See comment above in __init__
+-        c['tb'] = None
++        # Actually we need the self.tb for when we raise using self.raiseException
++        #c['tb'] = None
+ 
+         if self.stack is not None:
+             # XXX: This is a band-aid.  I can't figure out where these
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080813/970937de/attachment.html