[CalendarServer-changes] [4975] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 4975
          http://trac.macosforge.org/projects/calendarserver/changeset/4975
Author:   wsanchez at apple.com
Date:     2010-01-28 17:20:59 -0800 (Thu, 28 Jan 2010)
Log Message:
-----------
pyflakes

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/sidecar/task.py
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/calendarserver/tools/principals.py
    CalendarServer/trunk/twistedcaldav/mail.py
    CalendarServer/trunk/twistedcaldav/notify.py
    CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
    CalendarServer/trunk/twistedcaldav/upgrade.py

Modified: CalendarServer/trunk/calendarserver/sidecar/task.py
===================================================================
--- CalendarServer/trunk/calendarserver/sidecar/task.py	2010-01-29 01:15:35 UTC (rev 4974)
+++ CalendarServer/trunk/calendarserver/sidecar/task.py	2010-01-29 01:20:59 UTC (rev 4975)
@@ -28,7 +28,6 @@
 from zope.interface import implements
 
 from twisted.application.service import Service, IServiceMaker
-from twisted.internet.address import IPv4Address
 from twisted.internet.defer import DeferredList, inlineCallbacks, returnValue
 from twisted.internet.reactor import callLater
 from twisted.plugin import IPlugin

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2010-01-29 01:15:35 UTC (rev 4974)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2010-01-29 01:20:59 UTC (rev 4975)
@@ -43,7 +43,6 @@
 from twisted.internet.reactor import callLater, spawnProcess
 from twisted.internet.process import ProcessExitedAlready
 from twisted.internet.protocol import Protocol, Factory
-from twisted.internet.address import IPv4Address
 from twisted.application.internet import TCPServer, UNIXServer
 from twisted.application.service import Service, MultiService, IServiceMaker
 from twisted.scripts.mktap import getid
@@ -85,7 +84,6 @@
 from twistedcaldav.localization import processLocalizationFiles
 from twistedcaldav.mail import IMIPReplyInboxResource
 from twistedcaldav.notify import installNotificationClient
-from twistedcaldav.pdmonster import PDClientAddressWrapper
 from twistedcaldav.resource import CalDAVResource, AuthenticationWrapper
 from twistedcaldav.static import CalendarHomeProvisioningFile
 from twistedcaldav.static import IScheduleInboxFile

Modified: CalendarServer/trunk/calendarserver/tools/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/principals.py	2010-01-29 01:15:35 UTC (rev 4974)
+++ CalendarServer/trunk/calendarserver/tools/principals.py	2010-01-29 01:20:59 UTC (rev 4975)
@@ -26,7 +26,6 @@
 
 from twisted.python.util import switchUID
 from twisted.internet import reactor
-from twisted.internet.address import IPv4Address
 from twisted.internet.defer import inlineCallbacks
 from twisted.web2.dav import davxml
 

Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py	2010-01-29 01:15:35 UTC (rev 4974)
+++ CalendarServer/trunk/twistedcaldav/mail.py	2010-01-29 01:20:59 UTC (rev 4975)
@@ -39,7 +39,6 @@
 from twisted.application import internet, service
 from twisted.cred.portal import Portal
 from twisted.internet import protocol, defer, ssl, reactor
-from twisted.internet.address import IPv4Address
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 from twisted.mail import pop3client, imap4
 from twisted.mail.smtp import messageid, rfc822date, ESMTPSenderFactory

Modified: CalendarServer/trunk/twistedcaldav/notify.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/notify.py	2010-01-29 01:15:35 UTC (rev 4974)
+++ CalendarServer/trunk/twistedcaldav/notify.py	2010-01-29 01:20:59 UTC (rev 4975)
@@ -42,7 +42,6 @@
 from twext.log import LoggingMixIn
 
 from twisted.internet.protocol import ReconnectingClientFactory, ServerFactory
-from twisted.internet.address import IPv4Address
 from twisted.internet.ssl import ClientContextFactory
 from twisted.internet.defer import inlineCallbacks, Deferred
 from twisted.protocols.basic import LineReceiver

Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2010-01-29 01:15:35 UTC (rev 4974)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2010-01-29 01:20:59 UTC (rev 4975)
@@ -1190,9 +1190,9 @@
         upgradeData(config)
         self.assertTrue(self.verifyHierarchy(root, after))
 
-        calendarUserProxyDatabase = CalendarUserProxyDatabase(root)
-        resourceInfoDatabase = ResourceInfoDatabase(root)
-
+#        calendarUserProxyDatabase = CalendarUserProxyDatabase(root)
+#        resourceInfoDatabase = ResourceInfoDatabase(root)
+#
 #        for guid, info in assignments.iteritems():
 #
 #            proxyGroup = "%s#calendar-proxy-write" % (guid,)

Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py	2010-01-29 01:15:35 UTC (rev 4974)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py	2010-01-29 01:20:59 UTC (rev 4975)
@@ -27,7 +27,7 @@
 from twext.log import Logger
 
 from twistedcaldav.directory.directory import DirectoryService
-from twistedcaldav.directory.resourceinfo import ResourceInfoDatabase
+#from twistedcaldav.directory.resourceinfo import ResourceInfoDatabase
 from twistedcaldav.mail import MailGatewayTokensDatabase
 from twistedcaldav.ical import Component
 from twistedcaldav import caldavxml
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100128/61f61a64/attachment.html>