[CalendarServer-changes] [294] CalendarServer/trunk/lib-patches/Twisted

[source_changes at macosforge.org]

Revision: 294
          http://trac.macosforge.org/projects/calendarserver/changeset/294
Author:   wsanchez at apple.com
Date:     2006-10-23 21:51:09 -0700 (Mon, 23 Oct 2006)

Log Message:
-----------
pyflakes

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch	2006-10-24 04:40:42 UTC (rev 293)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch	2006-10-24 04:51:09 UTC (rev 294)
@@ -1,8 +1,17 @@
 Index: twisted/web2/dav/method/copymove.py
 ===================================================================
---- twisted/web2/dav/method/copymove.py	(revision 18375)
+--- twisted/web2/dav/method/copymove.py	(revision 18479)
 +++ twisted/web2/dav/method/copymove.py	(working copy)
-@@ -38,7 +38,7 @@
+@@ -29,8 +29,6 @@
+ 
+ __all__ = ["http_COPY", "http_MOVE"]
+ 
+-import urlparse
+-
+ from twisted.python import log
+ from twisted.internet.defer import waitForDeferred, deferredGenerator
+ from twisted.web2 import responsecode
+@@ -38,7 +36,7 @@
  from twisted.web2.filter.location import addLocation
  from twisted.web2.dav import davxml
  from twisted.web2.dav.idav import IDAVResource
@@ -11,7 +20,7 @@
  from twisted.web2.dav.util import parentForURL
  
  # FIXME: This is circular
-@@ -81,7 +81,15 @@
+@@ -81,7 +79,15 @@
          # May need to add a location header
          addLocation(request, destination_uri)
  
@@ -28,9 +37,9 @@
      yield x
      yield x.getResult()
  
-@@ -144,7 +152,14 @@
-     # May need to add a location header
-     addLocation(request, destination_uri)
+@@ -144,7 +150,14 @@
+         log.err(msg)
+         raise HTTPError(StatusResponse(responsecode.BAD_REQUEST, msg))
  
 -    x = waitForDeferred(move(self.fp, request.uri, destination.fp, destination_uri, depth))
 +    #x = waitForDeferred(move(self.fp, request.uri, destination.fp, destination_uri, depth))

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch	2006-10-24 04:40:42 UTC (rev 293)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch	2006-10-24 04:51:09 UTC (rev 294)
@@ -1,17 +1,19 @@
 Index: twisted/web2/dav/test/test_prop.py
 ===================================================================
---- twisted/web2/dav/test/test_prop.py	(revision 18219)
+--- twisted/web2/dav/test/test_prop.py	(revision 18479)
 +++ twisted/web2/dav/test/test_prop.py	(working copy)
-@@ -21,6 +21,8 @@
+@@ -21,10 +21,8 @@
  #
  # DRI: Wilfredo Sanchez, wsanchez at apple.com
  ##
-+from twisted.web2.dav.element.rfc4331 import QuotaUsedBytes
-+from twisted.web2.dav.element.rfc4331 import QuotaAvailableBytes
- 
+-
  import random
  
-@@ -37,7 +39,14 @@
+-from twisted.trial.unittest import SkipTest
+ from twisted.web2 import responsecode
+ from twisted.web2.iweb import IResponse
+ from twisted.web2.stream import MemoryStream
+@@ -37,13 +35,14 @@
  from twisted.web2.dav.test.util import serialize
  import twisted.web2.dav.test.util
  
@@ -21,9 +23,14 @@
 +    (dav_namespace, "quota-available-bytes"     ),
 +    (dav_namespace, "quota-used-bytes"          ),
 +)
-+
+ 
+-#
+-# See whether dead properties are available
+-#
+-from twisted.web2.dav.noneprops import NonePropertyStore
+-from twisted.web2.dav.static import DeadPropertyStore
 +live_properties = [lookupElement(qname)() for qname in DAVResource.liveProperties if (qname[0] == dav_namespace) and qname not in dynamicLiveProperties]
 +print live_properties
  
- #
- # See whether dead properties are available
+ class PROP(twisted.web2.dav.test.util.TestCase):
+     """

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061023/b4b88f38/attachment.html