Diff
Modified: CalendarServer/trunk/twistedcaldav/cluster.py (1521 => 1522)
--- CalendarServer/trunk/twistedcaldav/cluster.py 2007-05-11 20:55:38 UTC (rev 1521)
+++ CalendarServer/trunk/twistedcaldav/cluster.py 2007-05-11 21:05:05 UTC (rev 1522)
@@ -23,7 +23,6 @@
from twisted.python import log
from twisted.runner import procmon
-from twisted.scripts.mktap import getid
from twisted.application import internet, service
from twistedcaldav import logging
Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py (1521 => 1522)
--- CalendarServer/trunk/twistedcaldav/directory/principal.py 2007-05-11 20:55:38 UTC (rev 1521)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2007-05-11 21:05:05 UTC (rev 1522)
@@ -33,8 +33,7 @@
from twisted.python.failure import Failure
from twisted.internet.defer import succeed
from twisted.web2 import responsecode
-from twisted.web2.http import Response, HTTPError
-from twisted.web2.http_headers import MimeType
+from twisted.web2.http import HTTPError
from twisted.web2.dav import davxml
from twisted.web2.dav.util import joinURL
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_sudo.py (1521 => 1522)
--- CalendarServer/trunk/twistedcaldav/directory/test/test_sudo.py 2007-05-11 20:55:38 UTC (rev 1521)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_sudo.py 2007-05-11 21:05:05 UTC (rev 1522)
@@ -21,7 +21,6 @@
import twistedcaldav.directory.test.util
from twistedcaldav.directory.sudo import SudoDirectoryService
-from twistedcaldav.py.plistlib import writePlist
plistFile = FilePath(os.path.join(os.path.dirname(__file__), "sudoers.plist"))
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_util.py (1521 => 1522)
--- CalendarServer/trunk/twistedcaldav/directory/test/test_util.py 2007-05-11 20:55:38 UTC (rev 1521)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_util.py 2007-05-11 21:05:05 UTC (rev 1522)
@@ -16,7 +16,7 @@
# DRI: Wilfredo Sanchez, wsanchez@apple.com
##
-from twistedcaldav.directory.util import *
+from twistedcaldav.directory.util import uuidFromName
import twisted.trial.unittest
Modified: CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py (1521 => 1522)
--- CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2007-05-11 20:55:38 UTC (rev 1521)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2007-05-11 21:05:05 UTC (rev 1522)
@@ -30,7 +30,6 @@
from twisted.python.filepath import FilePath
from twistedcaldav.directory.directory import DirectoryService
-from twistedcaldav.resource import CalDAVResource
ELEMENT_ACCOUNTS = "accounts"
ELEMENT_USER = "user"
Modified: CalendarServer/trunk/twistedcaldav/index.py (1521 => 1522)
--- CalendarServer/trunk/twistedcaldav/index.py 2007-05-11 20:55:38 UTC (rev 1521)
+++ CalendarServer/trunk/twistedcaldav/index.py 2007-05-11 21:05:05 UTC (rev 1522)
@@ -39,7 +39,6 @@
from twisted.python import log
-from twistedcaldav.dateops import normalizeForIndex
from twistedcaldav.ical import Component
from twistedcaldav.query import calendarquery
from twistedcaldav import caldavxml
Modified: CalendarServer/trunk/twistedcaldav/static.py (1521 => 1522)
--- CalendarServer/trunk/twistedcaldav/static.py 2007-05-11 20:55:38 UTC (rev 1521)
+++ CalendarServer/trunk/twistedcaldav/static.py 2007-05-11 21:05:05 UTC (rev 1522)
@@ -54,6 +54,7 @@
from twistedcaldav import caldavxml
from twistedcaldav import customxml
+from twistedcaldav.caldavxml import caldav_namespace
from twistedcaldav.config import config
from twistedcaldav.directory.directory import DirectoryService
from twistedcaldav.extensions import DAVFile
Modified: CalendarServer/trunk/twistedcaldav/tap.py (1521 => 1522)
--- CalendarServer/trunk/twistedcaldav/tap.py 2007-05-11 20:55:38 UTC (rev 1521)
+++ CalendarServer/trunk/twistedcaldav/tap.py 2007-05-11 21:05:05 UTC (rev 1522)
@@ -16,15 +16,12 @@
# DRI: David Reid, dreid@apple.com
##
-import random
import os
import stat
-import sys
from zope.interface import implements
from twisted.python import log
-
from twisted.python.usage import Options, UsageError
from twisted.python.reflect import namedClass
@@ -45,10 +42,8 @@
from twisted.web2.server import Site
from twistedcaldav import logging
-
from twistedcaldav.cluster import makeService_Combined, makeService_Master
from twistedcaldav.config import config, parseConfig, defaultConfig, ConfigurationError
-from twistedcaldav.logging import RotatingFileAccessLoggingObserver
from twistedcaldav.root import RootResource
from twistedcaldav.resource import CalDAVResource
from twistedcaldav.directory.digest import QopDigestCredentialFactory
@@ -56,10 +51,9 @@
from twistedcaldav.directory.aggregate import AggregateDirectoryService
from twistedcaldav.directory.sudo import SudoDirectoryService
+from twistedcaldav import pdmonster
from twistedcaldav.static import CalendarHomeProvisioningFile
-from twistedcaldav import pdmonster
-
try:
from twistedcaldav.authkerb import NegotiateCredentialFactory
except ImportError:
Modified: CalendarServer/trunk/twistedcaldav/test/test_config.py (1521 => 1522)
--- CalendarServer/trunk/twistedcaldav/test/test_config.py 2007-05-11 20:55:38 UTC (rev 1521)
+++ CalendarServer/trunk/twistedcaldav/test/test_config.py 2007-05-11 21:05:05 UTC (rev 1522)
@@ -20,7 +20,7 @@
from twistedcaldav.py.plistlib import writePlist
-from twistedcaldav.config import config, defaultConfig, parseConfig, ConfigurationError
+from twistedcaldav.config import config, defaultConfig, ConfigurationError
testConfig = """<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">