[CalendarServer-changes] [5124] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 5124
          http://trac.macosforge.org/projects/calendarserver/changeset/5124
Author:   wsanchez at apple.com
Date:     2010-02-15 16:24:34 -0800 (Mon, 15 Feb 2010)
Log Message:
-----------
pyflakes

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py

Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2010-02-16 00:23:48 UTC (rev 5123)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py	2010-02-16 00:24:34 UTC (rev 5124)
@@ -36,7 +36,7 @@
 from twext.python.plistlib import writePlist
 from twext.internet.tcp import MaxAcceptTCPServer, MaxAcceptSSLServer
 
-from twistedcaldav.config import config, ConfigDict, _mergeData
+from twistedcaldav.config import config, ConfigDict
 from twistedcaldav.stdconfig import DEFAULT_CONFIG
 
 from twistedcaldav.directory.aggregate import AggregateDirectoryService

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py	2010-02-16 00:23:48 UTC (rev 5123)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipalmembers.py	2010-02-16 00:24:34 UTC (rev 5124)
@@ -30,7 +30,6 @@
 from twistedcaldav.config import config
 from twistedcaldav.directory import augment, calendaruserproxy
 from twistedcaldav.directory.calendaruserproxyloader import XMLCalendarUserProxyLoader
-import os
 
 class ProxyPrincipals (twistedcaldav.test.util.TestCase):
     """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100215/1a285ce0/attachment.html>