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

[source_changes at macosforge.org]

Revision: 3844
          http://trac.macosforge.org/projects/calendarserver/changeset/3844
Author:   exarkun at twistedmatrix.com
Date:     2009-03-12 10:35:12 -0700 (Thu, 12 Mar 2009)
Log Message:
-----------
Update, removing parts already in Twisted, and so patch can actually apply it

Seems patch sometimes mis-identifies a patch as "already applied" even if it isn't; maybe due to the
already-applied first hunk?  Dunno.

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

Modified: CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.static.patch
===================================================================
--- CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.static.patch	2009-03-12 17:29:13 UTC (rev 3843)
+++ CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.static.patch	2009-03-12 17:35:12 UTC (rev 3844)
@@ -1,16 +1,8 @@
 Index: twisted/web2/static.py
 ===================================================================
---- twisted/web2/static.py	(revision 19773)
+--- twisted/web2/static.py	(revision 26342)
 +++ twisted/web2/static.py	(working copy)
-@@ -9,7 +9,6 @@
- # System Imports
- import os, time, stat
- import tempfile
--import md5
- 
- # Sibling Imports
- from twisted.web2 import http_headers, resource
-@@ -200,7 +199,10 @@
+@@ -197,7 +197,10 @@
          super(File, self).__init__()
  
          self.putChildren = {}
@@ -22,7 +14,7 @@
          # Remove the dots from the path to split
          self.defaultType = defaultType
          self.ignoredExts = list(ignoredExts)
-@@ -383,7 +385,7 @@
+@@ -377,7 +380,7 @@
              return responsecode.NOT_FOUND
  
          if self.fp.isdir():
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090312/ee6e7f9f/attachment.html>