[CalendarServer-changes] [4809] CalendarServer/branches/users/cdaboo/deployment-partition-4722/ lib-patches/Twisted/twisted.web2.client.http.patch

[source_changes at macosforge.org]

Revision: 4809
          http://trac.macosforge.org/projects/calendarserver/changeset/4809
Author:   cdaboo at apple.com
Date:     2009-11-30 11:45:24 -0800 (Mon, 30 Nov 2009)
Log Message:
-----------
Sync with latest Twisted changes to try and eliminate a defer alreadyCalledError.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/deployment-partition-4722/lib-patches/Twisted/twisted.web2.client.http.patch

Modified: CalendarServer/branches/users/cdaboo/deployment-partition-4722/lib-patches/Twisted/twisted.web2.client.http.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/deployment-partition-4722/lib-patches/Twisted/twisted.web2.client.http.patch	2009-11-25 20:36:32 UTC (rev 4808)
+++ CalendarServer/branches/users/cdaboo/deployment-partition-4722/lib-patches/Twisted/twisted.web2.client.http.patch	2009-11-30 19:45:24 UTC (rev 4809)
@@ -2,9 +2,21 @@
 ===================================================================
 --- twisted/web2/client/http.py	(revision 19773)
 +++ twisted/web2/client/http.py	(working copy)
-@@ -134,8 +134,7 @@
-         self.responseDefer.errback(ProtocolError(text))
+@@ -127,15 +127,16 @@
  
+     def _error(self, err):
+         self.abortParse()
+-        self.responseDefer.errback(err)
++        if hasattr(self, 'stream') and self.stream is not None:
++            self.stream.finish(err)
++        else:
++            self.responseDefer.errback(err)
+ 
+     def _abortWithError(self, errcode, text):
+-        self.abortParse()
+-        self.responseDefer.errback(ProtocolError(text))
++        self._error(ProtocolError(text))
+ 
      def connectionLost(self, reason):
 -        ### FIXME!
 -        pass
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091130/9ec7d672/attachment.html>