[CalendarServer-changes] [2614] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.stream. patch

[source_changes at macosforge.org]

Revision: 2614
          http://trac.macosforge.org/projects/calendarserver/changeset/2614
Author:   cdaboo at apple.com
Date:     2008-06-23 08:43:00 -0700 (Mon, 23 Jun 2008)
Log Message:
-----------
Make sure we don't hash None.

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.stream.patch

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.stream.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.stream.patch	2008-06-20 17:55:46 UTC (rev 2613)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.stream.patch	2008-06-23 15:43:00 UTC (rev 2614)
@@ -2,7 +2,7 @@
 ===================================================================
 --- twisted/web2/dav/stream.py	(revision 0)
 +++ twisted/web2/dav/stream.py	(revision 0)
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,76 @@
 +##
 +# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
 +#
@@ -58,12 +58,14 @@
 +        
 +        if isinstance(b, Deferred):
 +            def _gotData(data):
-+                self.md5.update(data)
++                if data is not None:
++                    self.md5.update(data)
 +                return data
 +            b.addCallback(_gotData)
 +        else:
 +            # Update current MD5 state
-+            self.md5.update(str(b))
++            if b is not None:
++                self.md5.update(str(b))
 +    
 +        return b
 +    
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080623/b38549cd/attachment.htm