[CalendarServer-changes] [669] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 669
          http://trac.macosforge.org/projects/calendarserver/changeset/669
Author:   wsanchez at apple.com
Date:     2006-12-04 21:32:15 -0800 (Mon, 04 Dec 2006)

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

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/principal.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_apache.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
    CalendarServer/trunk/twistedcaldav/extensions.py
    CalendarServer/trunk/twistedcaldav/method/post.py
    CalendarServer/trunk/twistedcaldav/repository.py
    CalendarServer/trunk/twistedcaldav/static.py

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2006-12-05 05:23:27 UTC (rev 668)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2006-12-05 05:32:15 UTC (rev 669)
@@ -33,7 +33,6 @@
 from twisted.web2.http import Response, HTTPError
 from twisted.web2.http_headers import MimeType
 from twisted.web2.dav import davxml
-from twisted.web2.dav.resource import TwistedACLInheritable
 from twisted.web2.dav.util import joinURL
 
 from twistedcaldav.extensions import ReadOnlyResourceMixIn, DAVFile

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_apache.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_apache.py	2006-12-05 05:23:27 UTC (rev 668)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_apache.py	2006-12-05 05:32:15 UTC (rev 669)
@@ -48,8 +48,6 @@
         "left_coast" : ("wsanchez", "dreid", "lecroy"),
     }
 
-    serviceClass = BasicDirectoryService
-
     def service(self):
         return self.serviceClass(self.userFile(), self.groupFile())
 
@@ -91,6 +89,8 @@
     """
     Test Apache-Compatible UserFile/GroupFile directory implementation.
     """
+    serviceClass = BasicDirectoryService
+
     userFileName = basicUserFile
     userEntry = ("wsanchez", "wsanchez:Cytm0Bwm7CPJs\n")
 
@@ -98,6 +98,8 @@
     """
     Test Apache-Compatible DigestFile/GroupFile directory implementation.
     """
+    serviceClass = DigestDirectoryService
+
     userFileName = digestUserFile
     userEntry = ("wsanchez", "wsanchez:Test:decbe233ab3d997cacc2fc058b19db8c\n")
 

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py	2006-12-05 05:23:27 UTC (rev 668)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py	2006-12-05 05:32:15 UTC (rev 669)
@@ -25,7 +25,6 @@
 
 import os
 
-from twisted.internet.defer import deferredGenerator, waitForDeferred
 from twisted.web2.dav import davxml
 from twisted.web2.dav.fileop import rmdir
 from twisted.web2.dav.resource import AccessDeniedError

Modified: CalendarServer/trunk/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/extensions.py	2006-12-05 05:23:27 UTC (rev 668)
+++ CalendarServer/trunk/twistedcaldav/extensions.py	2006-12-05 05:32:15 UTC (rev 669)
@@ -30,7 +30,7 @@
 import time
 
 from twisted.web2 import responsecode
-from twisted.web2.http import HTTPError, Response
+from twisted.web2.http import HTTPError, Response, RedirectResponse
 from twisted.web2.http_headers import MimeType
 from twisted.web2.stream import FileStream
 from twisted.web2.static import MetaDataMixin
@@ -55,7 +55,7 @@
         if self.fp.isdir():
             if req.uri[-1] != "/":
                 # Redirect to include trailing '/' in URI
-                return http.RedirectResponse(req.unparseURL(path=req.path+'/'))
+                return RedirectResponse(req.unparseURL(path=req.path+'/'))
             else:
                 ifp = self.fp.childSearchPreauth(*self.indexNames)
                 if ifp:

Modified: CalendarServer/trunk/twistedcaldav/method/post.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/post.py	2006-12-05 05:23:27 UTC (rev 668)
+++ CalendarServer/trunk/twistedcaldav/method/post.py	2006-12-05 05:32:15 UTC (rev 669)
@@ -22,7 +22,6 @@
 
 __all__ = ["http_POST"]
 
-from twisted.internet.defer import deferredGenerator, waitForDeferred
 from twisted.web2.dav.util import parentForURL
 
 from twistedcaldav import caldavxml

Modified: CalendarServer/trunk/twistedcaldav/repository.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/repository.py	2006-12-05 05:23:27 UTC (rev 668)
+++ CalendarServer/trunk/twistedcaldav/repository.py	2006-12-05 05:32:15 UTC (rev 669)
@@ -30,14 +30,11 @@
 from xml.dom.minidom import Text
 import xml.dom.minidom
 
-from zope.interface import implements
-
 from twisted.application.internet import SSLServer, TCPServer
 from twisted.application.service import Application, IServiceCollection, MultiService
 from twisted.cred.portal import Portal
 from twisted.internet.ssl import DefaultOpenSSLContextFactory
 from twisted.python import log
-from twisted.python.filepath import FilePath
 from twisted.python.reflect import namedObject
 from twisted.web2.auth import basic, digest
 from twisted.web2.channel.http import HTTPFactory
@@ -54,7 +51,6 @@
 from twistedcaldav.logging import RotatingFileAccessLoggingObserver
 from twistedcaldav.resource import CalDAVResource
 from twistedcaldav.static import CalendarHomeFile
-from twistedcaldav.directory.idirectory import IDirectoryService
 
 ELEMENT_REPOSITORY = "repository"
 

Modified: CalendarServer/trunk/twistedcaldav/static.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/static.py	2006-12-05 05:23:27 UTC (rev 668)
+++ CalendarServer/trunk/twistedcaldav/static.py	2006-12-05 05:32:15 UTC (rev 669)
@@ -35,11 +35,9 @@
 
 from twisted.internet.defer import deferredGenerator, fail, succeed, waitForDeferred
 from twisted.python import log
-from twisted.python.filepath import FilePath
 from twisted.web2 import responsecode
 from twisted.web2.http import HTTPError, StatusResponse
 from twisted.web2.dav import davxml
-from twisted.web2.dav.auth import TwistedPasswordProperty
 from twisted.web2.dav.fileop import mkcollection, rmdir
 from twisted.web2.dav.http import ErrorResponse
 from twisted.web2.dav.idav import IDAVResource
@@ -52,7 +50,7 @@
 from twistedcaldav.ical import Component as iComponent
 from twistedcaldav.ical import Property as iProperty
 from twistedcaldav.index import Index, IndexSchedule, db_basename
-from twistedcaldav.resource import CalDAVResource, isNonCalendarCollectionParentResource, CalendarPrincipalResource
+from twistedcaldav.resource import CalDAVResource, isNonCalendarCollectionParentResource
 from twistedcaldav.resource import ScheduleInboxResource, ScheduleOutboxResource
 from twistedcaldav.resource import isCalendarCollectionResource
 from twistedcaldav.extensions import DAVFile

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