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

[source_changes at macosforge.org]

Revision: 2915
          http://trac.macosforge.org/projects/calendarserver/changeset/2915
Author:   cdaboo at apple.com
Date:     2008-08-29 13:08:40 -0700 (Fri, 29 Aug 2008)
Log Message:
-----------
Clean-up.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/aggregate.py
    CalendarServer/trunk/twistedcaldav/mail.py
    CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py

Modified: CalendarServer/trunk/twistedcaldav/directory/aggregate.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/aggregate.py	2008-08-29 19:50:25 UTC (rev 2914)
+++ CalendarServer/trunk/twistedcaldav/directory/aggregate.py	2008-08-29 20:08:40 UTC (rev 2915)
@@ -37,7 +37,7 @@
     baseGUID = "06FB225F-39E7-4D34-B1D1-29925F5E619B"
 
     def __init__(self, services):
-        DirectoryService.__init__(self)
+        super(AggregateDirectoryService, self).__init__()
 
         realmName = None
         recordTypes = {}

Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py	2008-08-29 19:50:25 UTC (rev 2914)
+++ CalendarServer/trunk/twistedcaldav/mail.py	2008-08-29 20:08:40 UTC (rev 2915)
@@ -19,32 +19,36 @@
 
 """
 
+from email.mime.image import MIMEImage
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+
+from twisted.application import internet, service
 from twisted.internet import protocol, defer, ssl
-from twisted.web import resource, static, server, client
-from twisted.internet.defer import fail, succeed, inlineCallbacks, returnValue
-from twisted.protocols import basic
+from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.mail import pop3client, imap4
+from twisted.mail.smtp import messageid, rfc822date, sendmail
 from twisted.plugin import IPlugin
-from twisted.application import internet, service
 from twisted.python.usage import Options, UsageError
-from twisted.python.reflect import namedClass
-from twisted.mail.smtp import messageid, rfc822date, sendmail
+from twisted.web import resource, server, client
+from twisted.web2.dav import davxml
+from twisted.web2.http import Response
+from twisted.web2.http_headers import MimeType 
+
+from twistedcaldav import ical, caldavxml
+from twistedcaldav.config import config, parseConfig, defaultConfig
+from twistedcaldav.ical import Property
 from twistedcaldav.log import Logger, LoggingMixIn
-from twistedcaldav import ical
 from twistedcaldav.resource import CalDAVResource
 from twistedcaldav.scheduling.scheduler import IMIPScheduler
-from twistedcaldav.config import config, parseConfig, defaultConfig
 from twistedcaldav.sql import AbstractSQLDatabase
-from twistedcaldav.ical import Property
-from zope.interface import Interface, implements
-import email, email.utils
-from email.mime.multipart import MIMEMultipart
-from email.mime.image import MIMEImage
-from email.mime.text import MIMEText
+
+from zope.interface import implements
+
+import datetime
+import email.utils
+import os
 import uuid
-import os
-import datetime
-import base64
 
 __all__ = [
     "IMIPInboxResource",

Modified: CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py	2008-08-29 19:50:25 UTC (rev 2914)
+++ CalendarServer/trunk/twistedcaldav/scheduling/scheduler.py	2008-08-29 20:08:40 UTC (rev 2915)
@@ -51,6 +51,7 @@
     "Scheduler",
     "CalDAVScheduler",
     "IScheduleScheduler",
+    "IMIPScheduler",
 ]
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080829/f590fa11/attachment.html