[CalendarServer-changes] [2365]
CalendarServer/branches/propfind-cache/twistedcaldav/directory
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 2 11:03:14 PDT 2008
Revision: 2365
http://trac.macosforge.org/projects/calendarserver/changeset/2365
Author: dreid at apple.com
Date: 2008-05-02 11:03:13 -0700 (Fri, 02 May 2008)
Log Message:
-----------
Delete trailing whitespace
Modified Paths:
--------------
CalendarServer/branches/propfind-cache/twistedcaldav/directory/principal.py
CalendarServer/branches/propfind-cache/twistedcaldav/directory/test/test_principal.py
Modified: CalendarServer/branches/propfind-cache/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/propfind-cache/twistedcaldav/directory/principal.py 2008-05-02 17:48:34 UTC (rev 2364)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/directory/principal.py 2008-05-02 18:03:13 UTC (rev 2365)
@@ -172,7 +172,7 @@
principalResource = typeResource.getChild(segments[2])
if principalResource:
return principalResource
-
+
return None
def principalForCalendarUserAddress(self, address):
@@ -378,7 +378,7 @@
return "(%s) %s" % (self.record.recordType, self.record.shortName)
def provisionFile(self):
-
+
result = super(DirectoryPrincipalResource, self).provisionFile()
if result:
self.writeDeadProperty(RecordTypeProperty(self.record.recordType))
@@ -439,13 +439,13 @@
def _calendar_user_proxy_index(self):
"""
Return the SQL database for calendar user proxies.
-
+
@return: the L{CalendarUserProxyDatabase} for the principal collection.
"""
-
+
# Get the principal collection we are contained in
pcollection = self.parent.parent
-
+
# The db is located in the principal collection root
if not hasattr(pcollection, "calendar_user_proxy_db"):
setattr(pcollection, "calendar_user_proxy_db", CalendarUserProxyDatabase(pcollection.fp.path))
@@ -510,7 +510,7 @@
def principalUID(self):
return self.record.guid
-
+
##
# Static
##
@@ -587,7 +587,7 @@
def autoSchedule(self):
return self.record.autoSchedule
-
+
def proxies(self):
return self._getRelatives("proxies")
Modified: CalendarServer/branches/propfind-cache/twistedcaldav/directory/test/test_principal.py
===================================================================
--- CalendarServer/branches/propfind-cache/twistedcaldav/directory/test/test_principal.py 2008-05-02 17:48:34 UTC (rev 2364)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/directory/test/test_principal.py 2008-05-02 18:03:13 UTC (rev 2365)
@@ -54,7 +54,7 @@
"""
def setUp(self):
super(ProvisionedPrincipals, self).setUp()
-
+
# Set up a principals hierarchy for each service we're testing with
self.principalRootResources = {}
for directory in directoryServices:
@@ -112,7 +112,7 @@
shortNames = set(typeResource.listChildren())
self.assertEquals(shortNames, set(r.shortName for r in directory.listRecords(recordType)))
-
+
for shortName in shortNames:
#print " -> %s" % (shortName,)
recordResource = typeResource.getChild(shortName)
@@ -303,34 +303,34 @@
provisioningResource = CalendarHomeProvisioningFile(path, directory, url)
calendarRootResources[directory.__class__.__name__] = provisioningResource
-
+
# Calendar home provisioners should result in calendar homes.
for provisioningResource, recordType, recordResource, record in self._allRecords():
if record.enabledForCalendaring:
homeURLs = tuple(recordResource.calendarHomeURLs())
self.failUnless(homeURLs)
-
+
calendarRootURL = calendarRootResources[record.service.__class__.__name__].url()
-
+
inboxURL = recordResource.scheduleInboxURL()
outboxURL = recordResource.scheduleOutboxURL()
-
+
self.failUnless(inboxURL)
self.failUnless(outboxURL)
-
+
for homeURL in homeURLs:
self.failUnless(homeURL.startswith(calendarRootURL))
-
+
if inboxURL and inboxURL.startswith(homeURL):
self.failUnless(len(inboxURL) > len(homeURL))
self.failUnless(inboxURL.endswith("/"))
inboxURL = None
-
+
if outboxURL and outboxURL.startswith(homeURL):
self.failUnless(len(outboxURL) > len(homeURL))
self.failUnless(outboxURL.endswith("/"))
outboxURL = None
-
+
self.failIf(inboxURL)
self.failIf(outboxURL)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080502/5b97e2f4/attachment.html
More information about the calendarserver-changes
mailing list