[CalendarServer-changes] [7452] CalendarServer/branches/users/glyph/new-export/txdav/caldav/ datastore/sql.py
source_changes at macosforge.org
source_changes at macosforge.org
Mon May 16 07:41:31 PDT 2011
Revision: 7452
http://trac.macosforge.org/projects/calendarserver/changeset/7452
Author: glyph at apple.com
Date: 2011-05-16 07:41:31 -0700 (Mon, 16 May 2011)
Log Message:
-----------
trim trailing whitespace.
Modified Paths:
--------------
CalendarServer/branches/users/glyph/new-export/txdav/caldav/datastore/sql.py
Modified: CalendarServer/branches/users/glyph/new-export/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/glyph/new-export/txdav/caldav/datastore/sql.py 2011-05-16 14:41:19 UTC (rev 7451)
+++ CalendarServer/branches/users/glyph/new-export/txdav/caldav/datastore/sql.py 2011-05-16 14:41:31 UTC (rev 7452)
@@ -113,7 +113,7 @@
@inlineCallbacks
def hasCalendarResourceUIDSomewhereElse(self, uid, ok_object, type):
-
+
objectResources = (yield self.objectResourcesWithUID(uid, ("inbox",)))
for objectResource in objectResources:
if ok_object and objectResource._resourceID == ok_object._resourceID:
@@ -121,18 +121,18 @@
matched_type = "schedule" if objectResource.isScheduleObject else "calendar"
if type == "schedule" or matched_type == "schedule":
returnValue(True)
-
+
returnValue(False)
@inlineCallbacks
def getCalendarResourcesForUID(self, uid, allow_shared=False):
-
+
results = []
objectResources = (yield self.objectResourcesWithUID(uid, ("inbox",)))
for objectResource in objectResources:
if allow_shared or objectResource._parentCollection._owned:
results.append(objectResource)
-
+
returnValue(results)
@@ -314,7 +314,7 @@
def __init__(self, calendar, name, uid, resourceID=None, metadata=None):
super(CalendarObject, self).__init__(calendar, name, uid, resourceID)
-
+
if metadata is None:
metadata = {}
self.accessMode = metadata.get("accessMode", "")
@@ -406,7 +406,7 @@
expand = PyCalendarDateTime(2100, 1, 1, 0, 0, 0, tzid=PyCalendarTimezone(utc=True))
doInstanceIndexing = True
else:
-
+
# If migrating or re-creating or config option for delayed indexing is off, always index
if reCreate or self._txn._migrating or not config.FreeBusyIndexDelayedExpand:
doInstanceIndexing = True
@@ -453,11 +453,11 @@
else:
raise
- # Now coerce indexing to off if needed
+ # Now coerce indexing to off if needed
if not doInstanceIndexing:
instances = None
recurrenceLimit = PyCalendarDateTime(1900, 1, 1, 0, 0, 0, tzid=PyCalendarTimezone(utc=True))
-
+
co = schema.CALENDAR_OBJECT
tr = schema.TIME_RANGE
tpy = schema.TRANSPARENCY
@@ -470,13 +470,13 @@
organizer = component.getOrganizer()
if not organizer:
organizer = ""
-
+
# CALENDAR_OBJECT table update
self._uid = component.resourceUID()
self._md5 = hashlib.md5(componentText).hexdigest()
self._size = len(componentText)
- # Special - if migrating we need to preserve the original md5
+ # Special - if migrating we need to preserve the original md5
if self._txn._migrating and hasattr(component, "md5"):
self._md5 = component.md5
@@ -494,7 +494,7 @@
# server dropbox collections and only then set the read mode
self._attachment = _ATTACHMENTS_MODE_READ
self._dropboxID = (yield self.dropboxID())
-
+
values = {
co.CALENDAR_RESOURCE_ID : self._calendar._resourceID,
co.RESOURCE_NAME : self._name,
@@ -513,7 +513,7 @@
co.PRIVATE_COMMENTS : self._private_comments,
co.MD5 : self._md5
}
-
+
if inserting:
self._resourceID, self._created, self._modified = (
yield Insert(
@@ -539,12 +539,12 @@
co.RECURRANCE_MAX :
pyCalendarTodatetime(normalizeForIndex(recurrenceLimit)) if recurrenceLimit else None,
}
-
+
yield Update(
values,
Where=co.RESOURCE_ID == self._resourceID
).on(self._txn)
-
+
# Need to wipe the existing time-range for this and rebuild
yield Delete(
From=tr,
@@ -580,7 +580,7 @@
tpy.USER_ID : useruid,
tpy.TRANSPARENT : transp,
}).on(self._txn))
-
+
# Special - for unbounded recurrence we insert a value for "infinity"
# that will allow an open-ended time-range to always match it.
if component.isRecurringUnbounded():
@@ -622,7 +622,7 @@
def getMetadata(self):
metadata = {}
- metadata["accessMode"] = self.accessMode
+ metadata["accessMode"] = self.accessMode
metadata["isScheduleObject"] = self.isScheduleObject
metadata["scheduleTag"] = self.scheduleTag
metadata["scheduleEtags"] = self.scheduleEtags
@@ -671,7 +671,7 @@
@inlineCallbacks
def createAttachmentWithName(self, name):
-
+
# We need to know the resource_ID of the home collection of the owner (not sharee)
# of this event
sharerHomeID = (yield self._parentCollection.sharerHomeID())
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110516/11de9310/attachment.html>
More information about the calendarserver-changes
mailing list