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

source_changes at macosforge.org source_changes at macosforge.org
Thu Sep 21 18:33:35 PDT 2006


Revision: 175
          http://trac.macosforge.org/projects/collaboration/changeset/175
Author:   wsanchez at apple.com
Date:     2006-09-21 18:33:34 -0700 (Thu, 21 Sep 2006)

Log Message:
-----------
Get rid of __version__, clean up __all__, etc.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/authkerb.py
    CalendarServer/trunk/twistedcaldav/caldavxml.py
    CalendarServer/trunk/twistedcaldav/customxml.py
    CalendarServer/trunk/twistedcaldav/dateops.py
    CalendarServer/trunk/twistedcaldav/db.py
    CalendarServer/trunk/twistedcaldav/directory.py
    CalendarServer/trunk/twistedcaldav/http.py
    CalendarServer/trunk/twistedcaldav/ical.py
    CalendarServer/trunk/twistedcaldav/index.py
    CalendarServer/trunk/twistedcaldav/itip.py
    CalendarServer/trunk/twistedcaldav/method/delete.py
    CalendarServer/trunk/twistedcaldav/method/mkcalendar.py
    CalendarServer/trunk/twistedcaldav/method/mkcol.py
    CalendarServer/trunk/twistedcaldav/method/post.py
    CalendarServer/trunk/twistedcaldav/method/put.py
    CalendarServer/trunk/twistedcaldav/method/put_common.py
    CalendarServer/trunk/twistedcaldav/method/report_calquery.py
    CalendarServer/trunk/twistedcaldav/method/report_freebusy.py
    CalendarServer/trunk/twistedcaldav/method/report_multiget.py
    CalendarServer/trunk/twistedcaldav/method/schedule.py
    CalendarServer/trunk/twistedcaldav/method/schedule_common.py
    CalendarServer/trunk/twistedcaldav/principalindex.py
    CalendarServer/trunk/twistedcaldav/repository.py
    CalendarServer/trunk/twistedcaldav/static.py

Modified: CalendarServer/trunk/twistedcaldav/authkerb.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/authkerb.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/authkerb.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -29,7 +29,6 @@
      that implements full GSSAPI authentication.
 """
 
-
 __all__ = [
     "BasicKerberosCredentials",
     "BasicKerberosAuthorizer",

Modified: CalendarServer/trunk/twistedcaldav/caldavxml.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/caldavxml.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/caldavxml.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -27,8 +27,6 @@
 See draft spec: http://ietf.webdav.org/caldav/draft-dusseault-caldav.txt
 """
 
-__version__ = "0.0"
-
 from twisted.python import log
 from twisted.web2.dav import davxml
 

Modified: CalendarServer/trunk/twistedcaldav/customxml.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/customxml.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/customxml.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -29,8 +29,6 @@
 from twisted.web2.dav.resource import twisted_dav_namespace
 from twisted.web2.dav import davxml
 
-__version__ = "0.0"
-
 class TwistedGUIDProperty (davxml.WebDAVTextElement):
     """
     Contains the GUID value for a directory record corresponding to a principal.

Modified: CalendarServer/trunk/twistedcaldav/dateops.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/dateops.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/dateops.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 Date/time Utilities
 """
 
-__version__ = "0.0"
-
 __all__ = [
     "normalizeToUTC",
     "normalizeForIndex",

Modified: CalendarServer/trunk/twistedcaldav/db.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/db.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/db.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -21,21 +21,16 @@
 different types of index we need in the server.
 """
 
+__all__ = ["AbstractIndex"]
+
 from pysqlite2 import dbapi2 as sqlite
 from twisted.python import log
 from twisted.python.failure import Failure
 import os
 
-__version__ = "0.0"
-
-__all__ = ["AbstractIndex"]
-
 db_basename = ".db.sqlite"
 
 class AbstractIndex(object):
-    """
-    """
-
     def __init__(self, resource, returnUTF8 = True):
         """
         @param resource: the L{twistedcaldav.static.CalDAVFile} resource to

Modified: CalendarServer/trunk/twistedcaldav/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/directory.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -19,6 +19,15 @@
 """
 Implements a directory-backed principal hierarchy.
 """
+
+__all__ = [
+    "DirectoryPrincipalFile",
+    "DirectoryUserPrincipalProvisioningResource",
+    "DirectoryGroupPrincipalProvisioningResource",
+    "DirectoryResourcePrincipalProvisioningResource",
+    "DirectoryPrincipalProvisioningResource",
+]
+
 from zope.interface import implements
 
 from twisted.cred import checkers, credentials, error
@@ -49,15 +58,6 @@
 import os
 import unicodedata
 
-__all__ = [
-    "DirectoryPrincipalFile",
-    "DirectoryUserPrincipalProvisioningResource",
-    "DirectoryGroupPrincipalProvisioningResource",
-    "DirectoryResourcePrincipalProvisioningResource",
-    "DirectoryPrincipalProvisioningResource",
-]
-
-
 class DirectoryCredentialsChecker:
     implements(checkers.ICredentialsChecker)
 

Modified: CalendarServer/trunk/twistedcaldav/http.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/http.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/http.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -16,11 +16,11 @@
 # DRI: Wilfredo Sanchez, wsanchez at apple.com
 ##
 
-__version__ = "0.0"
+__all__ = [
+    "ScheduleResponseResponse",
+    "ScheduleResponseQueue"
+]
 
-__all__ = ["ScheduleResponseResponse", "ScheduleResponseQueue"]
-
-
 from twisted.python import log
 from twisted.python.failure import Failure
 from twisted.web2 import responsecode

Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/ical.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 iCalendar Utilities
 """
 
-__version__ = "0.0"
-
 __all__ = [
     "Property",
     "Component",

Modified: CalendarServer/trunk/twistedcaldav/index.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/index.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/index.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -23,10 +23,12 @@
 change.
 """
 
-__version__ = "0.0"
+__all__ = [
+    "AbstractIndex",
+    "Index",
+    "IndexSchedule",
+]
 
-__all__ = ["Index"]
-
 import os
 import datetime
 
@@ -665,7 +667,6 @@
     """
     Schedule collection index - does not require UID uniqueness.
     """
-    
     def __init__(self, resource):
         """
         @param resource: the L{twistedcaldav.static.CalDAVFile} resource to

Modified: CalendarServer/trunk/twistedcaldav/itip.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/itip.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/itip.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -18,16 +18,20 @@
 
 """
 iTIP (RFC2446) processing.
+"""
 
-This is currently used for handling auto-replies to schedule request arriving in an Inbox. It is called in a delayed
-fashion via reactor.callLater.
+#
+# This is currently used for handling auto-replies to schedule requests arriving
+# in an inbox. It is called in a delayed fashion via reactor.callLater.
+#
+# We assume that all the components/calendars we deal with have been determined
+# as being 'valid for CalDAV/iTIP', i.e. they contain UIDs, single component
+# types, etc.
+#
+# The logic for component matching needs a lot more work as it currently does not
+# know how to deal with overridden instances.
+#
 
-BTW We assume that all the components/calendars we deal with have been determined as being 'valid for CalDAV/iTIP'.
-i.e. they contain UIDs, single component types etc.
-
-NB The logic for component matching needs a lot more work as it currently does not know how to deal with overridden instances.
-"""
-
 import datetime
 import logging
 import md5

Modified: CalendarServer/trunk/twistedcaldav/method/delete.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/delete.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/method/delete.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 CalDAV DELETE method.
 """
 
-__version__ = "0.0"
-
 __all__ = ["http_DELETE"]
 
 from twisted.internet.defer import maybeDeferred

Modified: CalendarServer/trunk/twistedcaldav/method/mkcalendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/mkcalendar.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/method/mkcalendar.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 CalDAV MKCALENDAR method.
 """
 
-__version__ = "0.0"
-
 __all__ = ["http_MKCALENDAR"]
 
 from twisted.internet.defer import deferredGenerator

Modified: CalendarServer/trunk/twistedcaldav/method/mkcol.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/mkcol.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/method/mkcol.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 CalDAV MKCOL method.
 """
 
-__version__ = "0.0"
-
 __all__ = ["http_MKCOL"]
 
 from twisted.internet.defer import deferredGenerator, waitForDeferred

Modified: CalendarServer/trunk/twistedcaldav/method/post.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/post.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/method/post.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 CalDAV POST method.
 """
 
-__version__ = "0.0"
-
 __all__ = ["http_POST"]
 
 from twisted.internet.defer import deferredGenerator, waitForDeferred

Modified: CalendarServer/trunk/twistedcaldav/method/put.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/put.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/method/put.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 CalDAV PUT method.
 """
 
-__version__ = "0.0"
-
 __all__ = ["http_PUT"]
 
 from twisted.internet.defer import deferredGenerator, waitForDeferred

Modified: CalendarServer/trunk/twistedcaldav/method/put_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/put_common.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/method/put_common.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 PUT/COPY/MOVE common behavior.
 """
 
-__version__ = "0.0"
-
 __all__ = ["storeCalendarObjectResource"]
 
 from twisted.internet.defer import maybeDeferred

Modified: CalendarServer/trunk/twistedcaldav/method/report_calquery.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_calquery.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/method/report_calquery.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 CalDAV calendar-query report
 """
 
-__version__ = "0.0"
-
 __all__ = ["report_urn_ietf_params_xml_ns_caldav_calendar_query"]
 
 from twisted.internet.defer import deferredGenerator, succeed, waitForDeferred

Modified: CalendarServer/trunk/twistedcaldav/method/report_freebusy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_freebusy.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/method/report_freebusy.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 CalDAV freebusy report
 """
 
-__version__ = "0.0"
-
 __all__ = ["report_urn_ietf_params_xml_ns_caldav_free_busy_query"]
 
 from twisted.internet.defer import deferredGenerator, waitForDeferred

Modified: CalendarServer/trunk/twistedcaldav/method/report_multiget.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_multiget.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/method/report_multiget.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 CalDAV multiget report
 """
 
-__version__ = "0.0"
-
 __all__ = ["report_urn_ietf_params_xml_ns_caldav_calendar_multiget"]
 
 from twisted.internet.defer import deferredGenerator, waitForDeferred

Modified: CalendarServer/trunk/twistedcaldav/method/schedule.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/schedule.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/method/schedule.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 CalDAV SCHEDULE method.
 """
 
-__version__ = "0.0"
-
 __all__ = ["http_SCHEDULE"]
 
 from twisted.internet.defer import deferredGenerator, waitForDeferred

Modified: CalendarServer/trunk/twistedcaldav/method/schedule_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/schedule_common.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/method/schedule_common.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 CalDAV Schedule processing.
 """
 
-__version__ = "0.0"
-
 __all__ = ["processScheduleRequest"]
 
 from twisted.internet import reactor

Modified: CalendarServer/trunk/twistedcaldav/principalindex.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/principalindex.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/principalindex.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -25,18 +25,16 @@
 
 """
 
-from twistedcaldav import customxml
-from twistedcaldav.db import AbstractIndex
-from twistedcaldav.db import db_basename
-
-__version__ = "0.0"
-
 __all__ = [
     "UserIndex",
     "GroupIndex",
     "ResourceIndex",
 ]
 
+from twistedcaldav import customxml
+from twistedcaldav.db import AbstractIndex
+from twistedcaldav.db import db_basename
+
 schema_version = "1"
 collection_types = {
     "Users"    : "User Principals",

Modified: CalendarServer/trunk/twistedcaldav/repository.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/repository.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/repository.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -22,6 +22,8 @@
 properties, access control etc setup.
 """
 
+__all__ = ["RepositoryBuilder"]
+
 from twisted.python import log
 from twisted.python.filepath import FilePath
 from twisted.web2.dav import davxml
@@ -100,28 +102,30 @@
 ELEMENT_AUTORESPOND = "autorespond"
 ATTRIBUTE_REPEAT = "repeat"
 
-classMap = {"DAVFile":                                        DAVFile,
-            "CalDAVFile":                                     CalDAVFile,
-            "CalendarPrincipalProvisioningResource":          CalendarPrincipalProvisioningResource,
-            "CalendarUserPrincipalProvisioningResource":      CalendarUserPrincipalProvisioningResource,
-            "CalendarPrincipalFile":                          CalendarPrincipalFile,
-            "CalendarHomeProvisioningFile":                   CalendarHomeProvisioningFile,
-            "CalendarHomeFile":                               CalendarHomeFile,
-            "DirectoryPrincipalProvisioningResource":         DirectoryPrincipalProvisioningResource,
-            "DirectoryUserPrincipalProvisioningResource":     DirectoryUserPrincipalProvisioningResource,
-            "DirectoryGroupPrincipalProvisioningResource":    DirectoryGroupPrincipalProvisioningResource,
-            "DirectoryResourcePrincipalProvisioningResource": DirectoryResourcePrincipalProvisioningResource,
+classMap = {
+    "DAVFile":                                        DAVFile,
+    "CalDAVFile":                                     CalDAVFile,
+    "CalendarPrincipalProvisioningResource":          CalendarPrincipalProvisioningResource,
+    "CalendarUserPrincipalProvisioningResource":      CalendarUserPrincipalProvisioningResource,
+    "CalendarPrincipalFile":                          CalendarPrincipalFile,
+    "CalendarHomeProvisioningFile":                   CalendarHomeProvisioningFile,
+    "CalendarHomeFile":                               CalendarHomeFile,
+    "DirectoryPrincipalProvisioningResource":         DirectoryPrincipalProvisioningResource,
+    "DirectoryUserPrincipalProvisioningResource":     DirectoryUserPrincipalProvisioningResource,
+    "DirectoryGroupPrincipalProvisioningResource":    DirectoryGroupPrincipalProvisioningResource,
+    "DirectoryResourcePrincipalProvisioningResource": DirectoryResourcePrincipalProvisioningResource,
 }
 
-urld = ["CalendarPrincipalProvisioningResource",
-        "CalendarUserPrincipalProvisioningResource",
-        "DirectoryPrincipalProvisioningResource",
-        "DirectoryUserPrincipalProvisioningResource",
-        "DirectoryGroupPrincipalProvisioningResource",
-        "DirectoryResourcePrincipalProvisioningResource",
-        ]
+urld = [
+    "CalendarPrincipalProvisioningResource",
+    "CalendarUserPrincipalProvisioningResource",
+    "DirectoryPrincipalProvisioningResource",
+    "DirectoryUserPrincipalProvisioningResource",
+    "DirectoryGroupPrincipalProvisioningResource",
+    "DirectoryResourcePrincipalProvisioningResource",
+]
 
-class RepositoryBuilder(object):
+class RepositoryBuilder (object):
     """
     Builds a repository hierarchy at a supplied document root file system path,
     and optionally provisions accounts.
@@ -172,7 +176,7 @@
             elif child._get_localName() == ELEMENT_ACCOUNTS:
                 self.accounts.parseXML(child)
 
-class DocRoot(object):
+class DocRoot (object):
     """
     Represents the hierarchy of resource collections that form the CalDAV repository.
     """
@@ -217,7 +221,7 @@
             pcs = TwistedPrincipalCollectionSetProperty(davxml.HRef.fromString(self.principalCollection.uri))
             self.collection.resource.writeDeadProperty(pcs)
 
-class Collection(object):
+class Collection (object):
     """
     Contains information about a collection in the repository.
     """
@@ -345,7 +349,7 @@
 
         return self.resource
 
-class Prop(object):
+class Prop (object):
     """
     Parses a property from XML.
     """
@@ -377,7 +381,7 @@
 
         return propClazz(*children)
         
-class ACL(object):
+class ACL (object):
     """
     Parses a DAV:ACL from XML.
     """
@@ -481,7 +485,7 @@
                    item = davxml.HRef.fromString("")
         return davxml.Inherited(item)
     
-class Provisioner(object):
+class Provisioner (object):
     """
     Manages account provisioning.
     """
@@ -659,7 +663,7 @@
             fbset = caldavxml.CalendarFreeBusySet(*[davxml.HRef.fromString(uri) for uri in calendars])
             inbox.writeDeadProperty(fbset)
 
-class ProvisionPrincipal(object):
+class ProvisionPrincipal (object):
     """
     Contains provision information for one user.
     """
@@ -732,5 +736,3 @@
                 self.acl.parseXML(child)
             elif child._get_localName() == ELEMENT_AUTORESPOND:
                 self.autorespond = True
-
-           

Modified: CalendarServer/trunk/twistedcaldav/static.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/static.py	2006-09-22 01:19:15 UTC (rev 174)
+++ CalendarServer/trunk/twistedcaldav/static.py	2006-09-22 01:33:34 UTC (rev 175)
@@ -20,8 +20,6 @@
 CalDAV-aware static resources.
 """
 
-__version__ = "0.0"
-
 __all__ = [
     "CalDAVFile",
     "ScheduleInboxFile",

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


More information about the calendarserver-changes mailing list