[CalendarServer-changes] [3842] CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/ Twisted/twisted.web2.http.patch

[source_changes at macosforge.org]

Revision: 3842
          http://trac.macosforge.org/projects/calendarserver/changeset/3842
Author:   exarkun at twistedmatrix.com
Date:     2009-03-12 10:28:17 -0700 (Thu, 12 Mar 2009)
Log Message:
-----------
Resolve conflict

Modified Paths:
--------------
    CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.http.patch

Modified: CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.http.patch
===================================================================
--- CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.http.patch	2009-03-12 17:11:35 UTC (rev 3841)
+++ CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.http.patch	2009-03-12 17:28:17 UTC (rev 3842)
@@ -1,6 +1,6 @@
 Index: twisted/web2/http.py
 ===================================================================
---- twisted/web2/http.py	(revision 19773)
+--- twisted/web2/http.py	(revision 26342)
 +++ twisted/web2/http.py	(working copy)
 @@ -26,7 +26,7 @@
  from twisted.web2 import http_headers
@@ -11,20 +11,17 @@
  
  defaultPortForScheme = {'http': 80, 'https':443, 'ftp':21}
  
-@@ -66,9 +66,9 @@
+@@ -66,8 +66,8 @@
              object.
          @type codeOrResponse: C{int} or L{http.Response}
          """
 -        Exception.__init__(self)
--        self.response = iweb.IResponse(codeOrResponse)
--        self.args = str(self.response)
-+        response = iweb.IResponse(codeOrResponse)
-+        Exception.__init__(self, str(response))
-+        self.response = response
+         self.response = iweb.IResponse(codeOrResponse)
++        Exception.__init__(self, str(self.response))
  
      def __repr__(self):
          return "<%s %s>" % (self.__class__.__name__, self.response)
-@@ -408,9 +408,22 @@
+@@ -407,9 +407,22 @@
      def _sendContinue(self):
          self.chanRequest.writeIntermediateResponse(responsecode.CONTINUE)
  
@@ -48,7 +45,7 @@
  
      def _error(self, reason):
          if reason.check(error.ConnectionLost):
-@@ -471,5 +484,5 @@
+@@ -470,5 +483,5 @@
  else:
      components.registerAdapter(compat.OldResourceAdapter, resource.IResource, iweb.IOldNevowResource)
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090312/db361a28/attachment-0001.html>