[CalendarServer-changes] [13799] CalendarServer/trunk/txdav/caldav
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jul 28 08:18:44 PDT 2014
Revision: 13799
http://trac.calendarserver.org//changeset/13799
Author: cdaboo at apple.com
Date: 2014-07-28 08:18:44 -0700 (Mon, 28 Jul 2014)
Log Message:
-----------
White space.
Modified Paths:
--------------
CalendarServer/trunk/txdav/caldav/datastore/file.py
CalendarServer/trunk/txdav/caldav/datastore/index_file.py
CalendarServer/trunk/txdav/caldav/datastore/query/test/test_filter.py
CalendarServer/trunk/txdav/caldav/datastore/schedule.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/test/test_scheduler.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/outbound.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_inbound.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_mailgateway.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_remoteservers.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/utils.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_freebusy.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_icalsplitter.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_work.py
CalendarServer/trunk/txdav/caldav/datastore/scheduling/utils.py
CalendarServer/trunk/txdav/caldav/datastore/test/common.py
CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py
CalendarServer/trunk/txdav/caldav/datastore/test/test_implicit.py
CalendarServer/trunk/txdav/caldav/datastore/test/test_index_file.py
CalendarServer/trunk/txdav/caldav/datastore/test/test_queue_scheduling.py
CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_external.py
CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_sharing.py
CalendarServer/trunk/txdav/caldav/datastore/test/util.py
CalendarServer/trunk/txdav/caldav/datastore/util.py
CalendarServer/trunk/txdav/caldav/icalendarstore.py
Modified: CalendarServer/trunk/txdav/caldav/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/file.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/file.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -173,8 +173,10 @@
for calendar in self.calendars():
for calendarObject in calendar.calendarObjects():
component = calendarObject.component()
- if (component.hasPropertyInAnyComponent("X-APPLE-DROPBOX") or
- component.hasPropertyInAnyComponent("ATTACH")):
+ if (
+ component.hasPropertyInAnyComponent("X-APPLE-DROPBOX") or
+ component.hasPropertyInAnyComponent("ATTACH")
+ ):
dropboxID = (yield calendarObject.dropboxID())
dropboxIDs.append(dropboxID)
returnValue(dropboxIDs)
Modified: CalendarServer/trunk/txdav/caldav/datastore/index_file.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/index_file.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/index_file.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -874,15 +874,16 @@
def reserveUID(self, uid):
uid = uid.encode('utf-8')
self.log.debug("Reserving UID %r @ %r" % (
- uid,
- self.index.resource.fp.path))
+ uid,
+ self.index.resource.fp.path)
+ )
def _handleFalse(result):
if result is False:
raise ReservationError(
"UID %s already reserved for calendar collection %s."
% (uid, self.index.resource)
- )
+ )
d = self.getCachePool().add(self._key(uid),
'reserved',
@@ -894,15 +895,16 @@
def unreserveUID(self, uid):
uid = uid.encode('utf-8')
self.log.debug("Unreserving UID %r @ %r" % (
- uid,
- self.index.resource.fp.path))
+ uid,
+ self.index.resource.fp.path)
+ )
def _handleFalse(result):
if result is False:
raise ReservationError(
"UID %s is not reserved for calendar collection %s."
% (uid, self.index.resource)
- )
+ )
d = self.getCachePool().delete(self._key(uid))
d.addCallback(_handleFalse)
@@ -912,8 +914,9 @@
def isReservedUID(self, uid):
uid = uid.encode('utf-8')
self.log.debug("Is reserved UID %r @ %r" % (
- uid,
- self.index.resource.fp.path))
+ uid,
+ self.index.resource.fp.path)
+ )
def _checkValue((flags, value)):
if value is None:
@@ -967,7 +970,7 @@
raise ReservationError(
"UID %s is not reserved for calendar collection %s."
% (uid, self.index.resource)
- )
+ )
else:
try:
self.index._db_execute(
@@ -1114,7 +1117,7 @@
except ValueError:
log.error("Non-calendar resource: %s" % (name,))
else:
- #log.info("Indexing resource: %s" % (name,))
+ # og.info("Indexing resource: %s" % (name,))
self.addResource(name, calendar, True, reCreate=True)
finally:
stream.close()
@@ -1226,7 +1229,7 @@
except ValueError:
log.error("Non-calendar resource: %s" % (name,))
else:
- #log.info("Indexing resource: %s" % (name,))
+ # log.info("Indexing resource: %s" % (name,))
self.addResource(name, calendar, True, reCreate=True)
finally:
stream.close()
Modified: CalendarServer/trunk/txdav/caldav/datastore/query/test/test_filter.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/query/test/test_filter.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/query/test/test_filter.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -1,4 +1,4 @@
-##
+# #
# Copyright (c) 2011-2014 Apple Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-##
+# #
from pycalendar.timezone import Timezone
@@ -54,7 +54,7 @@
filter = caldavxml.Filter(
caldavxml.ComponentFilter(
*[caldavxml.ComponentFilter(
- **{"name":("VEVENT", "VFREEBUSY", "VAVAILABILITY")}
+ **{"name": ("VEVENT", "VFREEBUSY", "VAVAILABILITY")}
)],
**{"name": "VCALENDAR"}
)
@@ -82,8 +82,8 @@
filter = caldavxml.Filter(
caldavxml.ComponentFilter(
*[caldavxml.ComponentFilter(
- *[caldavxml.TimeRange(**{"start":"20060605T160000Z", "end":"20060605T170000Z"})],
- **{"name":("VEVENT", "VFREEBUSY", "VAVAILABILITY")}
+ *[caldavxml.TimeRange(**{"start": "20060605T160000Z", "end": "20060605T170000Z"})],
+ **{"name": ("VEVENT", "VFREEBUSY", "VAVAILABILITY")}
)],
**{"name": "VCALENDAR"}
)
@@ -111,8 +111,8 @@
filter = caldavxml.Filter(
caldavxml.ComponentFilter(
*[caldavxml.ComponentFilter(
- *[caldavxml.TimeRange(**{"start":"20060605T160000Z", "end":"20060605T170000Z"})],
- **{"name":("VEVENT", "VFREEBUSY", "VAVAILABILITY")}
+ *[caldavxml.TimeRange(**{"start": "20060605T160000Z", "end": "20060605T170000Z"})],
+ **{"name": ("VEVENT", "VFREEBUSY", "VAVAILABILITY")}
)],
**{"name": "VCALENDAR"}
)
@@ -141,10 +141,10 @@
caldavxml.ComponentFilter(
*[
caldavxml.ComponentFilter(
- **{"name":("VEVENT")}
+ **{"name": ("VEVENT")}
),
caldavxml.ComponentFilter(
- **{"name":("VTODO")}
+ **{"name": ("VTODO")}
),
],
**{"name": "VCALENDAR"}
@@ -174,11 +174,11 @@
caldavxml.ComponentFilter(
*[
caldavxml.ComponentFilter(
- *[caldavxml.TimeRange(**{"start":"20060605T160000Z", })],
- **{"name":("VEVENT")}
+ *[caldavxml.TimeRange(**{"start": "20060605T160000Z", })],
+ **{"name": ("VEVENT")}
),
caldavxml.ComponentFilter(
- **{"name":("VTODO")}
+ **{"name": ("VTODO")}
),
],
**{"name": "VCALENDAR", "test": "anyof"}
@@ -208,7 +208,7 @@
filter = caldavxml.Filter(
caldavxml.ComponentFilter(
*[caldavxml.ComponentFilter(
- **{"name":("VEVENT", "VFREEBUSY", "VAVAILABILITY")}
+ **{"name": ("VEVENT", "VFREEBUSY", "VAVAILABILITY")}
)],
**{"name": "VCALENDAR"}
)
@@ -238,7 +238,7 @@
filter = caldavxml.Filter(
caldavxml.ComponentFilter(
*[caldavxml.ComponentFilter(
- **{"name":("VEVENT", "VFREEBUSY", "VAVAILABILITY")}
+ **{"name": ("VEVENT", "VFREEBUSY", "VAVAILABILITY")}
)],
**{"name": "VCALENDAR"}
)
@@ -260,8 +260,8 @@
filter = caldavxml.Filter(
caldavxml.ComponentFilter(
*[caldavxml.ComponentFilter(
- *[caldavxml.TimeRange(**{"start":"20060605T160000Z", "end":"20060605T170000Z"})],
- **{"name":("VEVENT", "VFREEBUSY", "VAVAILABILITY")}
+ *[caldavxml.TimeRange(**{"start": "20060605T160000Z", "end": "20060605T170000Z"})],
+ **{"name": ("VEVENT", "VFREEBUSY", "VAVAILABILITY")}
)],
**{"name": "VCALENDAR"}
)
@@ -287,10 +287,10 @@
caldavxml.ComponentFilter(
*[
caldavxml.ComponentFilter(
- **{"name":("VEVENT")}
+ **{"name": ("VEVENT")}
),
caldavxml.ComponentFilter(
- **{"name":("VTODO")}
+ **{"name": ("VTODO")}
),
],
**{"name": "VCALENDAR"}
@@ -315,11 +315,11 @@
caldavxml.ComponentFilter(
*[
caldavxml.ComponentFilter(
- *[caldavxml.TimeRange(**{"start":"20060605T160000Z", })],
- **{"name":("VEVENT")}
+ *[caldavxml.TimeRange(**{"start": "20060605T160000Z", })],
+ **{"name": ("VEVENT")}
),
caldavxml.ComponentFilter(
- **{"name":("VTODO")}
+ **{"name": ("VTODO")}
),
],
**{"name": "VCALENDAR", "test": "anyof"}
@@ -349,7 +349,7 @@
caldavxml.TextMatch.fromString("1234", False),
name="UID",
),
- **{"name":("VEVENT")}
+ **{"name": ("VEVENT")}
),
],
**{"name": "VCALENDAR", "test": "anyof"}
@@ -382,9 +382,9 @@
*[caldavxml.ComponentFilter(
*[caldavxml.ComponentFilter(
caldavxml.IsNotDefined(),
- **{"name":"VALARM"}
+ **{"name": "VALARM"}
)],
- **{"name":"VEVENT"}
+ **{"name": "VEVENT"}
)],
**{"name": "VCALENDAR"}
)
@@ -431,5 +431,4 @@
END:VALARM
END:VEVENT
END:VCALENDAR
-"""
- )))
+""")))
Modified: CalendarServer/trunk/txdav/caldav/datastore/schedule.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/schedule.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/schedule.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -53,9 +53,7 @@
-class ImplicitCalendarHome(
- proxyForInterface(ICalendarHome, "_calendarHome")
- ):
+class ImplicitCalendarHome(proxyForInterface(ICalendarHome, "_calendarHome")):
implements(ICalendarHome)
@@ -213,5 +211,4 @@
"""
Wrap an underlying L{ITransaction}.
"""
- return ImplicitTransaction(
- self._calendarStore.newTransaction(label))
+ return ImplicitTransaction(self._calendarStore.newTransaction(label))
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/test/test_scheduler.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/test/test_scheduler.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/caldav/test/test_scheduler.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -67,25 +67,25 @@
@classproperty(cache=False)
def requirements(cls): #@NoSelf
return {
- "user01": {
- "calendar_1": {
+ "user01": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
+ "user02": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- },
- "user02": {
- "calendar_1": {
+ "user03": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
- },
- },
- "user03": {
- "calendar_1": {
- },
- "inbox": {
- },
- },
- }
+ }
def storeUnderTest(self):
@@ -284,12 +284,7 @@
ORGANIZER:mailto:user01 at example.com
END:VFREEBUSY
END:VCALENDAR
-""" % {
- "now": self.now.getText(),
- "now_1D": self.now_1D.getText(),
- "now_12H": self.now_12H.getText(),
- "now_13H": self.now_13H.getText(),
-}
+""" % {"now": self.now.getText(), "now_1D": self.now_1D.getText(), "now_12H": self.now_12H.getText(), "now_13H": self.now_13H.getText(), }
scheduler = CalDAVScheduler(self.transactionUnderTest(), "user01")
result = (yield scheduler.doSchedulingViaPOST("mailto:user01 at example.com", ["mailto:user01 at example.com", ], Component.fromString(data_request)))
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -114,7 +114,8 @@
# If we're using our dedicated account on our local server, we're free
# to delete all messages that arrive in the inbox so as to not let
# cruft build up
- self.deleteAllMail = shouldDeleteAllMail(config.ServerHostName,
+ self.deleteAllMail = shouldDeleteAllMail(
+ config.ServerHostName,
settings.Server, settings.Username)
self.mailReceiver = MailReceiver(store, directory)
mailType = settings['Type']
@@ -126,12 +127,14 @@
contextFactory = None
if settings["UseSSL"]:
contextFactory = ssl.ClientContextFactory()
- self.point = GAIEndpoint(self.reactor, settings.Server,
+ self.point = GAIEndpoint(
+ self.reactor, settings.Server,
settings.Port, contextFactory=contextFactory)
def fetchMail(self):
- return self.point.connect(self.factory(self.settings, self.mailReceiver,
+ return self.point.connect(self.factory(
+ self.settings, self.mailReceiver,
self.deleteAllMail))
@@ -206,7 +209,7 @@
deliveryStatus = part
continue
elif contentType == "message/rfc822":
- #original = part
+ # original = part
continue
elif contentType == "text/calendar":
calBody = part.get_payload(decode=True)
@@ -259,16 +262,17 @@
organizer, attendee, _ignore_icaluid = result[0]
except:
# This isn't a token we recognize
- log.error("Mail gateway found a token (%s) but didn't "
- "recognize it in message %s"
- % (token, msgId))
+ log.error(
+ "Mail gateway found a token (%s) but didn't recognize it in message %s"
+ % (token, msgId))
returnValue(self.UNKNOWN_TOKEN)
calendar.removeAllButOneAttendee(attendee)
calendar.getOrganizerProperty().setValue(organizer)
for comp in calendar.subcomponents():
if comp.name() == "VEVENT":
- comp.addProperty(Property("REQUEST-STATUS",
+ comp.addProperty(Property(
+ "REQUEST-STATUS",
["5.1", "Service unavailable"]))
break
else:
@@ -278,7 +282,8 @@
log.warn("Mail gateway processing DSN %s" % (msgId,))
txn = self.store.newTransaction(label="MailReceiver.processDSN")
- yield txn.enqueue(IMIPReplyWork, organizer=organizer, attendee=attendee,
+ yield txn.enqueue(
+ IMIPReplyWork, organizer=organizer, attendee=attendee,
icalendarText=str(calendar))
yield txn.commit()
returnValue(self.INJECTION_SUBMITTED)
@@ -292,12 +297,14 @@
# addr looks like: server_address+token at example.com
token = self._extractToken(addr)
if not token:
- log.error("Mail gateway didn't find a token in message "
- "%s (%s)" % (msg['Message-ID'], msg['To']))
+ log.error(
+ "Mail gateway didn't find a token in message "
+ "%s (%s)" % (msg['Message-ID'], msg['To']))
returnValue(self.NO_TOKEN)
else:
- log.error("Mail gateway couldn't parse To: address (%s) in "
- "message %s" % (msg['To'], msg['Message-ID']))
+ log.error(
+ "Mail gateway couldn't parse To: address (%s) in "
+ "message %s" % (msg['To'], msg['Message-ID']))
returnValue(self.MALFORMED_TO_ADDRESS)
txn = self.store.newTransaction(label="MailReceiver.processReply")
@@ -308,9 +315,10 @@
organizer, attendee, _ignore_icaluid = result[0]
except:
# This isn't a token we recognize
- log.error("Mail gateway found a token (%s) but didn't "
- "recognize it in message %s"
- % (token, msg['Message-ID']))
+ log.error(
+ "Mail gateway found a token (%s) but didn't "
+ "recognize it in message %s"
+ % (token, msg['Message-ID']))
returnValue(self.UNKNOWN_TOKEN)
for part in msg.walk():
@@ -319,8 +327,9 @@
break
else:
# No icalendar attachment
- log.warn("Mail gateway didn't find an icalendar attachment "
- "in message %s" % (msg['Message-ID'],))
+ log.warn(
+ "Mail gateway didn't find an icalendar attachment "
+ "in message %s" % (msg['Message-ID'],))
toAddr = None
fromAddr = attendee[7:]
@@ -336,12 +345,14 @@
pass
if toAddr is None:
- log.error("Don't have an email address for the organizer; "
- "ignoring reply.")
+ log.error(
+ "Don't have an email address for the organizer; "
+ "ignoring reply.")
returnValue(self.NO_ORGANIZER_ADDRESS)
settings = config.Scheduling["iMIP"]["Sending"]
- smtpSender = SMTPSender(settings.Username, settings.Password,
+ smtpSender = SMTPSender(
+ settings.Username, settings.Password,
settings.UseSSL, settings.Server, settings.Port)
del msg["From"]
@@ -364,8 +375,9 @@
organizerProperty = calendar.getOrganizerProperty()
if organizerProperty is None:
# ORGANIZER is required per rfc2446 section 3.2.3
- log.warn("Mail gateway didn't find an ORGANIZER in REPLY %s"
- % (msg['Message-ID'],))
+ log.warn(
+ "Mail gateway didn't find an ORGANIZER in REPLY %s"
+ % (msg['Message-ID'],))
event.addProperty(Property("ORGANIZER", organizer))
else:
organizerProperty.setValue(organizer)
@@ -374,7 +386,8 @@
# The attendee we're expecting isn't there, so add it back
# with a SCHEDULE-STATUS of SERVICE_UNAVAILABLE.
# The organizer will then see that the reply was not successful.
- attendeeProp = Property("ATTENDEE", attendee,
+ attendeeProp = Property(
+ "ATTENDEE", attendee,
params={
"SCHEDULE-STATUS": iTIPRequestStatus.SERVICE_UNAVAILABLE,
}
@@ -387,7 +400,8 @@
# email template for the message.
txn = self.store.newTransaction(label="MailReceiver.processReply")
- yield txn.enqueue(IMIPReplyWork, organizer=organizer, attendee=attendee,
+ yield txn.enqueue(
+ IMIPReplyWork, organizer=organizer, attendee=attendee,
icalendarText=str(calendar))
yield txn.commit()
returnValue(self.INJECTION_SUBMITTED)
@@ -422,11 +436,13 @@
return self.processDSN(calBody, msg['Message-ID'])
else:
# It's a DSN without enough to go on
- log.error("Mail gateway can't process DSN %s"
- % (msg['Message-ID'],))
+ log.error(
+ "Mail gateway can't process DSN %s"
+ % (msg['Message-ID'],))
return succeed(self.INCOMPLETE_DSN)
- log.info("Mail gateway received message %s from %s to %s" %
+ log.info(
+ "Mail gateway received message %s from %s to %s" %
(msg['Message-ID'], msg['From'], msg['To']))
return self.processReply(msg)
@@ -465,14 +481,16 @@
def serverGreeting(self, greeting):
self.log.debug("POP servergreeting")
pop3client.POP3Client.serverGreeting(self, greeting)
- login = self.login(self.factory.settings["Username"],
+ login = self.login(
+ self.factory.settings["Username"],
self.factory.settings["Password"])
login.addCallback(self.cbLoggedIn)
login.addErrback(self.cbLoginFailed)
def cbLoginFailed(self, reason):
- self.log.error("POP3 login failed for %s" %
+ self.log.error(
+ "POP3 login failed for %s" %
(self.factory.settings["Username"],))
return self.quit()
@@ -551,9 +569,11 @@
def serverGreeting(self, capabilities):
self.log.debug("IMAP servergreeting")
- return self.authenticate(self.factory.settings["Password"]
- ).addCallback(self.cbLoggedIn
- ).addErrback(self.ebAuthenticateFailed)
+ return self.authenticate(
+ self.factory.settings["Password"]
+ ).addCallback(
+ self.cbLoggedIn
+ ).addErrback(self.ebAuthenticateFailed)
def ebLogError(self, error):
@@ -561,12 +581,15 @@
def ebAuthenticateFailed(self, reason):
- self.log.debug("IMAP authenticate failed for {name}, trying login",
+ self.log.debug(
+ "IMAP authenticate failed for {name}, trying login",
name=self.factory.settings["Username"])
- return self.login(self.factory.settings["Username"],
+ return self.login(
+ self.factory.settings["Username"],
self.factory.settings["Password"]
- ).addCallback(self.cbLoggedIn
- ).addErrback(self.ebLoginFailed)
+ ).addCallback(
+ self.cbLoggedIn
+ ).addErrback(self.ebLoginFailed)
def ebLoginFailed(self, reason):
@@ -610,9 +633,9 @@
if self.messageUIDs:
nextUID = self.messageUIDs.pop(0)
messageListToFetch = imap4.MessageSet(nextUID)
- self.log.debug("Downloading message %d of %d (%s)" %
- (self.messageCount - len(self.messageUIDs), self.messageCount,
- nextUID))
+ self.log.debug(
+ "Downloading message %d of %d (%s)" %
+ (self.messageCount - len(self.messageUIDs), self.messageCount, nextUID))
self.fetchMessage(messageListToFetch, True).addCallback(
self.cbGotMessage, messageListToFetch).addErrback(
self.ebLogError)
@@ -647,8 +670,9 @@
def cbFlagDeleted(self, messageList):
- self.addFlags(messageList, ("\\Deleted",),
- uid=True).addCallback(self.cbMessageDeleted, messageList)
+ self.addFlags(
+ messageList, ("\\Deleted",), uid=True
+ ).addCallback(self.cbMessageDeleted, messageList)
def cbMessageDeleted(self, results, messageList):
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/outbound.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/outbound.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/outbound.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -77,9 +77,11 @@
if cls.mailSender is None:
if config.Scheduling.iMIP.Enabled:
settings = config.Scheduling.iMIP.Sending
- smtpSender = SMTPSender(settings.Username, settings.Password,
+ smtpSender = SMTPSender(
+ settings.Username, settings.Password,
settings.UseSSL, settings.Server, settings.Port)
- cls.mailSender = MailSender(settings.Address,
+ cls.mailSender = MailSender(
+ settings.Address,
settings.SuppressionDays, smtpSender, getLanguage(config))
return cls.mailSender
@@ -92,7 +94,8 @@
mailSender = self.getMailSender()
if mailSender is not None:
calendar = Component.fromString(self.icalendarText)
- yield mailSender.outbound(self.transaction,
+ yield mailSender.outbound(
+ self.transaction,
self.fromAddr, self.toAddr, calendar)
#
@@ -469,13 +472,14 @@
if emailAddress:
attendeeProp.setValue("mailto:%s" % (emailAddress,))
- msgId, message = self.generateEmail(inviteState, calendar, orgEmail,
+ msgId, message = self.generateEmail(
+ inviteState, calendar, orgEmail,
orgCN, attendees, formattedFrom, addressWithToken, recipient,
language=self.language)
try:
- success = (yield self.smtpSender.sendMessage(fromAddr, toAddr,
- msgId, message))
+ success = (yield self.smtpSender.sendMessage(
+ fromAddr, toAddr, msgId, message))
returnValue(success)
except Exception, e:
self.log.error("Failed to send IMIP message (%s)" % (str(e),))
@@ -543,8 +547,9 @@
plainText = self.renderPlainText(details, (orgCN, orgEmail),
attendees, canceled)
- htmlText = self.renderHTML(details, (orgCN, orgEmail),
- attendees, canceled)
+ htmlText = self.renderHTML(
+ details, (orgCN, orgEmail), attendees, canceled
+ )
msg = MIMEMultipart()
msg["From"] = fromAddress
@@ -581,7 +586,8 @@
method = calendar.propertyValue("METHOD").lower()
msgIcal.set_param("method", method)
msgIcal.add_header("Content-ID", "<invitation.ics>")
- msgIcal.add_header("Content-Disposition",
+ msgIcal.add_header(
+ "Content-Disposition",
"inline;filename=invitation.ics")
msg.attach(msgIcal)
@@ -600,15 +606,17 @@
plainAttendeeList = []
for cn, mailto in attendees:
if cn:
- plainAttendeeList.append(cn if not mailto else
- "%s <%s>" % (cn, mailto))
+ plainAttendeeList.append(
+ cn if not mailto else "%s <%s>" % (cn, mailto)
+ )
elif mailto:
plainAttendeeList.append("<%s>" % (mailto,))
details['plainAttendees'] = ", ".join(plainAttendeeList)
- details['plainOrganizer'] = (orgCN if not orgEmail else
- "%s <%s>" % (orgCN, orgEmail))
+ details['plainOrganizer'] = (
+ orgCN if not orgEmail else "%s <%s>" % (orgCN, orgEmail)
+ )
# plain text version
if canceled:
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_inbound.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_inbound.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_inbound.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -44,7 +44,8 @@
yield self.buildStoreAndDirectory()
self.receiver = MailReceiver(self.store, self.directory)
- self.retriever = MailRetriever(self.store, self.directory,
+ self.retriever = MailRetriever(
+ self.store, self.directory,
ConfigDict({
"Type" : "pop",
"UseSSL" : False,
@@ -296,12 +297,11 @@
txn = self.store.newTransaction()
result = (yield injectMessage(
- txn,
- "urn:x-uid:user01",
- "mailto:xyzzy at example.com",
- calendar
- )
- )
+ txn,
+ "urn:x-uid:user01",
+ "mailto:xyzzy at example.com",
+ calendar
+ ))
yield txn.commit()
self.assertEquals(
"1.2;Scheduling message has been delivered",
@@ -329,12 +329,11 @@
txn = self.store.newTransaction()
result = (yield injectMessage(
- txn,
- "urn:x-uid:unknown_user",
- "mailto:xyzzy at example.com",
- calendar
- )
- )
+ txn,
+ "urn:x-uid:unknown_user",
+ "mailto:xyzzy at example.com",
+ calendar
+ ))
yield txn.commit()
self.assertEquals(
"3.7;Invalid Calendar User",
@@ -360,7 +359,8 @@
END:VCALENDAR
"""
txn = self.store.newTransaction()
- yield txn.enqueue(IMIPReplyWork,
+ yield txn.enqueue(
+ IMIPReplyWork,
organizer="urn:x-uid:user01",
attendee="mailto:xyzzy at example.com",
icalendarText=calendar
@@ -373,18 +373,33 @@
# Delete if the mail server is on the same host and using our
# dedicated account:
- self.assertTrue(shouldDeleteAllMail("calendar.example.com",
- "calendar.example.com", "com.apple.calendarserver"))
- self.assertTrue(shouldDeleteAllMail("calendar.example.com",
- "localhost", "com.apple.calendarserver"))
+ self.assertTrue(shouldDeleteAllMail(
+ "calendar.example.com",
+ "calendar.example.com",
+ "com.apple.calendarserver"
+ ))
+ self.assertTrue(shouldDeleteAllMail(
+ "calendar.example.com",
+ "localhost",
+ "com.apple.calendarserver"
+ ))
# Don't delete all otherwise:
- self.assertFalse(shouldDeleteAllMail("calendar.example.com",
- "calendar.example.com", "not_ours"))
- self.assertFalse(shouldDeleteAllMail("calendar.example.com",
- "localhost", "not_ours"))
- self.assertFalse(shouldDeleteAllMail("calendar.example.com",
- "mail.example.com", "com.apple.calendarserver"))
+ self.assertFalse(shouldDeleteAllMail(
+ "calendar.example.com",
+ "calendar.example.com",
+ "not_ours"
+ ))
+ self.assertFalse(shouldDeleteAllMail(
+ "calendar.example.com",
+ "localhost",
+ "not_ours"
+ ))
+ self.assertFalse(shouldDeleteAllMail(
+ "calendar.example.com",
+ "mail.example.com",
+ "com.apple.calendarserver"
+ ))
@inlineCallbacks
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_mailgateway.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_mailgateway.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_mailgateway.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -39,7 +39,8 @@
self.path = self.mktemp()
os.mkdir(self.path)
oldDB = MailGatewayTokensDatabase(self.path)
- oldDB.createToken("urn:uuid:user01", "mailto:attendee at example.com",
+ oldDB.createToken(
+ "urn:uuid:user01", "mailto:attendee at example.com",
"icaluid1", token="token1")
yield migrateTokensToStore(self.path, self.store)
txn = self.store.newTransaction()
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -286,7 +286,8 @@
def setUp(self):
self.store = yield buildStore(self, None)
self.directory = self.store.directoryService()
- self.sender = MailSender("server at example.com", 7, DummySMTPSender(),
+ self.sender = MailSender(
+ "server at example.com", 7, DummySMTPSender(),
language="en")
def _getSender(ignored):
@@ -304,7 +305,8 @@
@inlineCallbacks
def test_work(self):
txn = self.store.newTransaction()
- wp = (yield txn.enqueue(IMIPInvitationWork,
+ wp = (yield txn.enqueue(
+ IMIPInvitationWork,
fromAddr=ORGANIZER,
toAddr=ATTENDEE,
icalendarText=initialInviteText.replace("\n", "\r\n"),
@@ -332,7 +334,8 @@
self.sender.smtpSender.shouldSucceed = False
txn = self.store.newTransaction()
- wp = (yield txn.enqueue(IMIPInvitationWork,
+ wp = (yield txn.enqueue(
+ IMIPInvitationWork,
fromAddr=ORGANIZER,
toAddr=ATTENDEE,
icalendarText=initialInviteText.replace("\n", "\r\n"),
@@ -343,8 +346,10 @@
self.assertEquals(wp, self.wp)
- def _interceptEmail(self, inviteState, calendar, orgEmail, orgCn,
- attendees, fromAddress, replyToAddress, toAddress, language="en"):
+ def _interceptEmail(
+ self, inviteState, calendar, orgEmail, orgCn,
+ attendees, fromAddress, replyToAddress, toAddress, language="en"
+ ):
self.inviteState = inviteState
self.calendar = calendar
self.orgEmail = orgEmail
@@ -354,7 +359,8 @@
self.replyToAddress = replyToAddress
self.toAddress = toAddress
self.language = language
- self.results = self._actualGenerateEmail(inviteState, calendar,
+ self.results = self._actualGenerateEmail(
+ inviteState, calendar,
orgEmail, orgCn, attendees, fromAddress, replyToAddress, toAddress,
language=language)
return self.results
@@ -458,9 +464,11 @@
),
)
- for (inputCalendar, UID, inputOriginator, inputRecipient, inviteState,
+ for (
+ inputCalendar, UID, inputOriginator, inputRecipient, inviteState,
outputOrganizerEmail, outputOrganizerName, outputAttendeeList,
- outputFrom, encodedFrom, outputRecipient) in data:
+ outputFrom, encodedFrom, outputRecipient
+ ) in data:
txn = self.store.newTransaction()
yield self.sender.outbound(
@@ -484,11 +492,11 @@
if UID: # The organizer is local, and server is sending to remote
# attendee
txn = self.store.newTransaction()
- token = (yield txn.imipGetToken(inputOriginator, inputRecipient,
- UID))
+ token = (yield txn.imipGetToken(inputOriginator, inputRecipient, UID))
yield txn.commit()
self.assertNotEquals(token, None)
- self.assertEquals(msg["Reply-To"],
+ self.assertEquals(
+ msg["Reply-To"],
"server+%s at example.com" % (token,))
# Make sure attendee property for organizer exists and matches
@@ -535,7 +543,8 @@
self.assertEquals(token1, token2)
txn = self.store.newTransaction()
- self.assertEquals((yield txn.imipLookupByToken(token1)),
+ self.assertEquals(
+ (yield txn.imipLookupByToken(token1)),
[["organizer", "attendee", "icaluid"]])
yield txn.commit()
@@ -559,11 +568,11 @@
# Explictly store a token with mailto: CUA for organizer
# (something that doesn't happen any more, but did in the past)
txn = self.store.newTransaction()
- origToken = (yield txn.imipCreateToken(organizerEmail,
+ origToken = (yield txn.imipCreateToken(
+ organizerEmail,
"mailto:attendee at example.com",
"CFDD5E46-4F74-478A-9311-B3FF905449C3"
- )
- )
+ ))
yield txn.commit()
inputCalendar = initialInviteText
@@ -572,7 +581,8 @@
inputRecipient = "mailto:attendee at example.com"
txn = self.store.newTransaction()
- yield self.sender.outbound(txn, inputOriginator, inputRecipient,
+ yield self.sender.outbound(
+ txn, inputOriginator, inputRecipient,
Component.fromString(inputCalendar.replace("\n", "\r\n")),
onlyAfter=DateTime(2010, 1, 1, 0, 0, 0))
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -39,7 +39,7 @@
from txdav.caldav.datastore.scheduling.ischedule.scheduler import IScheduleScheduler
from txdav.caldav.datastore.scheduling.ischedule.xml import ischedule_namespace
from txdav.xml import element as davxml
-import txdav.caldav.datastore.scheduling.ischedule.xml as ischedulexml
+import txdav.caldav.datastore.scheduling.ischedule.xml as ischedulexml
__all__ = [
"IScheduleInboxResource",
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_dkim.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -328,7 +328,8 @@
data = (
# Count on Recipient
- ("""Host:example.com
+ (
+ """Host:example.com
Content-Type: text/calendar ; charset = "utf-8"
Originator: mailto:user01 at example.com
Recipient: mailto:user02 at example.com ,\t mailto:user03 at example.com\t\t
@@ -337,14 +338,15 @@
Cache-Control:no-cache
Connection:close
""",
- """content-type:text/calendar ; charset = "utf-8"
+ """content-type:text/calendar ; charset = "utf-8"
originator:mailto:user01 at example.com
recipient:mailto:user02 at example.com,mailto:user03 at example.com
ischedule-version:1.0
dkim-signature:v=1; d=example.com; s = dkim; t = 1234; a=rsa-sha1; q=dns/txt:http/well-known ; c=ischedule-relaxed/simple; h=Content-Type:Originator:Recipient:iSchedule-Version:iSchedule-Message-ID; bh=abc; b="""
),
# Exact count on Recipient
- ("""Host:example.com
+ (
+ """Host:example.com
Content-Type: text/calendar ; charset = "utf-8"
Originator: mailto:user01 at example.com
Recipient: mailto:user02 at example.com ,\t mailto:user03 at example.com\t\t
@@ -354,14 +356,15 @@
Cache-Control:no-cache
Connection:close
""",
- """content-type:text/calendar ; charset = "utf-8"
+ """content-type:text/calendar ; charset = "utf-8"
originator:mailto:user01 at example.com
recipient:mailto:user02 at example.com,mailto:user03 at example.com,mailto:user04 at example.com
ischedule-version:1.0
dkim-signature:v=1; d=example.com; s = dkim; t = 1234; a=rsa-sha1; q=dns/txt:http/well-known ; c=ischedule-relaxed/simple; h=Content-Type:Originator:Recipient:iSchedule-Version:iSchedule-Message-ID; bh=abc; b="""
),
# Re-ordered Content-Type
- ("""Host:example.com
+ (
+ """Host:example.com
iSchedule-Version: 1.0
Originator: mailto:user01 at example.com
Recipient: mailto:user02 at example.com ,\t mailto:user03 at example.com\t\t
@@ -370,7 +373,7 @@
Cache-Control:no-cache
Connection:close
""",
- """content-type:text/calendar ; charset = "utf-8"
+ """content-type:text/calendar ; charset = "utf-8"
originator:mailto:user01 at example.com
recipient:mailto:user02 at example.com,mailto:user03 at example.com
ischedule-version:1.0
@@ -393,7 +396,8 @@
data = (
# Valid
- ("""Host:example.com
+ (
+ """Host:example.com
Content-Type: text/calendar ; charset = "utf-8"
Originator: mailto:user01 at example.com
Recipient: mailto:user02 at example.com ,\t mailto:user03 at example.com\t\t
@@ -401,11 +405,12 @@
Cache-Control:no-cache
Connection:close
""",
- [DKIMUtils.extractTags("v=DKIM1; p=%s" % (self.public_key_data,))],
- True,
+ [DKIMUtils.extractTags("v=DKIM1; p=%s" % (self.public_key_data,))],
+ True,
),
# Invalid - no method
- ("""Host:example.com
+ (
+ """Host:example.com
Content-Type: text/calendar ; charset = "utf-8"
Originator: mailto:user01 at example.com
Recipient: mailto:user02 at example.com ,\t mailto:user03 at example.com\t\t
@@ -413,11 +418,12 @@
Cache-Control:no-cache
Connection:close
""",
- [DKIMUtils.extractTags("v=DKIM1; p=%s" % (self.public_key_data,))],
- False,
+ [DKIMUtils.extractTags("v=DKIM1; p=%s" % (self.public_key_data,))],
+ False,
),
# Invalid - wrong algorithm
- ("""Host:example.com
+ (
+ """Host:example.com
Content-Type: text/calendar ; charset = "utf-8"
Originator: mailto:user01 at example.com
Recipient: mailto:user02 at example.com ,\t mailto:user03 at example.com\t\t
@@ -425,8 +431,8 @@
Cache-Control:no-cache
Connection:close
""",
- [DKIMUtils.extractTags("v=DKIM1; h=sha-1; p=%s" % (self.public_key_data,))],
- False,
+ [DKIMUtils.extractTags("v=DKIM1; h=sha-1; p=%s" % (self.public_key_data,))],
+ False,
),
)
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_remoteservers.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_remoteservers.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_remoteservers.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -27,8 +27,7 @@
def test_readXML(self):
fp = FilePath(self.mktemp())
- fp.open("w").write(
-"""<?xml version="1.0" encoding="utf-8"?>
+ fp.open("w").write("""<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE servers SYSTEM "servertoserver.dtd">
<servers>
<server>
@@ -43,8 +42,7 @@
</hosts>
</server>
</servers>
-"""
-)
+""")
parser = IScheduleServersParser(fp)
self.assertEqual(len(parser.servers), 1)
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/test/test_resource.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -69,25 +69,25 @@
@classproperty(cache=False)
def requirements(cls): #@NoSelf
return {
- "user01": {
- "calendar_1": {
+ "user01": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
+ "user02": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- },
- "user02": {
- "calendar_1": {
+ "user03": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
- },
- },
- "user03": {
- "calendar_1": {
- },
- "inbox": {
- },
- },
- }
+ }
@inlineCallbacks
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/utils.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/utils.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/utils.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -66,9 +66,10 @@
log.debug("DNS SRV: lookup failed: {exc}", exc=e)
returnValue(None)
- if len(answers) == 1 and answers[0].type == dns.SRV \
- and answers[0].payload \
- and answers[0].payload.target == dns.Name('.'):
+ if (
+ len(answers) == 1 and answers[0].type == dns.SRV and answers[0].payload
+ and answers[0].payload.target == dns.Name('.')
+ ):
# decidedly not available
log.debug("DNS SRV: disabled: {l}", l=lookup)
returnValue(None)
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/scheduler.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -751,7 +751,8 @@
recipient = self.recipient_mapper(recipient)
if not suppressErrorLog and code > 400: # Error codes only
- self.log.error("Error during {method} for {r}: {msg}",
+ self.log.error(
+ "Error during {method} for {r}: {msg}",
method=self.method,
r=recipient,
msg=message,
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_freebusy.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_freebusy.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_freebusy.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -290,25 +290,25 @@
@classproperty(cache=False)
def requirements(cls): #@NoSelf
return {
- "user01": {
- "calendar_1": {
+ "user01": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
+ "user02": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- },
- "user02": {
- "calendar_1": {
+ "user03": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
- },
- },
- "user03": {
- "calendar_1": {
- },
- "inbox": {
- },
- },
- }
+ }
def storeUnderTest(self):
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_icalsplitter.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_icalsplitter.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_icalsplitter.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -210,7 +210,7 @@
END:VEVENT
END:VCALENDAR
""",
- False,
+ False,
),
(
"#2.4 Small, all cancelled, simple recurring component",
@@ -230,7 +230,7 @@
END:VEVENT
END:VCALENDAR
""",
- False,
+ False,
),
(
"#3.1 Small, old, recurring with future override",
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -896,25 +896,25 @@
@classproperty(cache=False)
def requirements(cls): #@NoSelf
return {
- "user01": {
- "calendar_1": {
+ "user01": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
+ "user02": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- },
- "user02": {
- "calendar_1": {
+ "user03": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
- },
- },
- "user03": {
- "calendar_1": {
- },
- "inbox": {
- },
- },
- }
+ }
@inlineCallbacks
@@ -1656,28 +1656,28 @@
@classproperty(cache=False)
def requirements(cls): #@NoSelf
return {
- "user01": {
- "calendar_1": {
- "organizer.ics": (cls.organizer_data, cls.metadata),
+ "user01": {
+ "calendar_1": {
+ "organizer.ics": (cls.organizer_data, cls.metadata),
+ },
+ "inbox": {
+ },
},
- "inbox": {
+ "user02": {
+ "calendar_1": {
+ "attendee2.ics": (cls.attendee2_data, cls.metadata),
+ },
+ "inbox": {
+ },
},
- },
- "user02": {
- "calendar_1": {
- "attendee2.ics": (cls.attendee2_data, cls.metadata),
+ "user03": {
+ "calendar_1": {
+ "attendee3.ics": (cls.attendee3_data, cls.metadata),
+ },
+ "inbox": {
+ },
},
- "inbox": {
- },
- },
- "user03": {
- "calendar_1": {
- "attendee3.ics": (cls.attendee3_data, cls.metadata),
- },
- "inbox": {
- },
- },
- }
+ }
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_work.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_work.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_work.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -226,8 +226,7 @@
{attendees}
END:VEVENT
END:VCALENDAR
-""".format(attendees="\n".join(["ATTENDEE:urn:x-uid:user%02d" % i for i in range(1, 100)]))
-)
+""".format(attendees="\n".join(["ATTENDEE:urn:x-uid:user%02d" % i for i in range(1, 100)])))
@inlineCallbacks
@@ -260,7 +259,7 @@
home2 = yield self.calendarUnderTest(home="user02", name="calendar")
cobjs = yield home2.calendarObjects()
self.assertEqual(len(cobjs), 1)
- #cal2 = yield cobjs[0].component()
+ # cal2 = yield cobjs[0].component()
yield work.delete()
yield jobs[0].delete()
Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/utils.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/utils.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/utils.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -62,9 +62,11 @@
lower = addr.lower()
if lower.startswith("mailto:"):
addr = lower
- if (addr.startswith("/") or
+ if (
+ addr.startswith("/") or
addr.startswith("http:") or
- addr.startswith("https:")):
+ addr.startswith("https:")
+ ):
return addr.rstrip("/")
else:
return addr
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/common.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/common.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/common.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -241,49 +241,50 @@
metadata3 = cls.metadata3.copy()
metadata4 = cls.metadata4.copy()
return {
- "home1": {
- "calendar_1": {
- "1.ics": (cal1Root.child("1.ics").getContent(), metadata1),
- "2.ics": (cal1Root.child("2.ics").getContent(), metadata2),
- "3.ics": (cal1Root.child("3.ics").getContent(), metadata3),
- "4.ics": (cal1Root.child("4.ics").getContent(), metadata4),
+ "home1": {
+ "calendar_1": {
+ "1.ics": (cal1Root.child("1.ics").getContent(), metadata1),
+ "2.ics": (cal1Root.child("2.ics").getContent(), metadata2),
+ "3.ics": (cal1Root.child("3.ics").getContent(), metadata3),
+ "4.ics": (cal1Root.child("4.ics").getContent(), metadata4),
+ },
+ "calendar_2": {},
+ "calendar_empty": {},
+ "not_a_calendar": None
},
- "calendar_2": {},
- "calendar_empty": {},
- "not_a_calendar": None
- },
- "home_splits": {
- "calendar_1": {
- "1.ics": (cal1SplitsRoot.child("1.ics").getContent(), metadata1),
- "2.ics": (cal1SplitsRoot.child("2.ics").getContent(), metadata2),
- "3.ics": (cal1SplitsRoot.child("3.ics").getContent(), metadata3),
+ "home_splits": {
+ "calendar_1": {
+ "1.ics": (cal1SplitsRoot.child("1.ics").getContent(), metadata1),
+ "2.ics": (cal1SplitsRoot.child("2.ics").getContent(), metadata2),
+ "3.ics": (cal1SplitsRoot.child("3.ics").getContent(), metadata3),
+ },
+ "calendar_2": {
+ "1.ics": (cal2SplitsRoot.child("1.ics").getContent(), metadata1),
+ "2.ics": (cal2SplitsRoot.child("2.ics").getContent(), metadata2),
+ "3.ics": (cal2SplitsRoot.child("3.ics").getContent(), metadata3),
+ "4.ics": (cal2SplitsRoot.child("4.ics").getContent(), metadata4),
+ "5.ics": (cal2SplitsRoot.child("5.ics").getContent(), metadata4),
+ },
},
- "calendar_2": {
- "1.ics": (cal2SplitsRoot.child("1.ics").getContent(), metadata1),
- "2.ics": (cal2SplitsRoot.child("2.ics").getContent(), metadata2),
- "3.ics": (cal2SplitsRoot.child("3.ics").getContent(), metadata3),
- "4.ics": (cal2SplitsRoot.child("4.ics").getContent(), metadata4),
- "5.ics": (cal2SplitsRoot.child("5.ics").getContent(), metadata4),
+ "home_no_splits": {
+ "calendar_1": {
+ "1.ics": (cal1NoSplitsRoot.child("1.ics").getContent(), metadata1),
+ "2.ics": (cal1NoSplitsRoot.child("2.ics").getContent(), metadata2),
+ "3.ics": (cal1NoSplitsRoot.child("3.ics").getContent(), metadata3),
+ },
},
- },
- "home_no_splits": {
- "calendar_1": {
- "1.ics": (cal1NoSplitsRoot.child("1.ics").getContent(), metadata1),
- "2.ics": (cal1NoSplitsRoot.child("2.ics").getContent(), metadata2),
- "3.ics": (cal1NoSplitsRoot.child("3.ics").getContent(), metadata3),
+ "home_splits_shared": {
+ "calendar_1": {},
},
- },
- "home_splits_shared": {
- "calendar_1": {},
- },
- "home_defaults": {
- "calendar_1": {
- "1.ics": (cal1DefaultsRoot.child("1.ics").getContent(), metadata1),
- "3.ics": (cal1DefaultsRoot.child("3.ics").getContent(), metadata3),
+ "home_defaults": {
+ "calendar_1": {
+ "1.ics": (cal1DefaultsRoot.child("1.ics").getContent(), metadata1),
+ "3.ics": (cal1DefaultsRoot.child("3.ics").getContent(), metadata3),
+ },
+ "inbox" : {},
},
- "inbox" : {},
- },
- }
+ }
+
md5s = {
"home1": {
"calendar_1": {
@@ -1378,8 +1379,9 @@
text.
"""
yield self.failUnlessFailure(
- maybeDeferred((yield self.calendarUnderTest()).createCalendarObjectWithName,
- "new", VComponent.fromString(test_event_notCalDAV_text)),
+ maybeDeferred(
+ (yield self.calendarUnderTest()).createCalendarObjectWithName,
+ "new", VComponent.fromString(test_event_notCalDAV_text)),
InvalidObjectResourceError,
InvalidComponentForStoreError,
)
@@ -1590,9 +1592,8 @@
cal = yield self.calendarUnderTest()
st = yield home.syncToken()
yield cal.createCalendarObjectWithName("new.ics", VComponent.fromString(
- test_event_text
- )
- )
+ test_event_text
+ ))
obj1 = yield cal.calendarObjectWithName("2.ics")
yield obj1.remove()
@@ -1629,9 +1630,8 @@
st = yield cal.syncToken()
rev = self.token2revision(st)
yield cal.createCalendarObjectWithName("new.ics", VComponent.fromString(
- test_event_text
- )
- )
+ test_event_text
+ ))
obj1 = yield cal.calendarObjectWithName("2.ics")
yield obj1.remove()
st2 = yield cal.syncToken()
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_attachments.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -113,15 +113,15 @@
metadata3 = cls.metadata3.copy()
metadata4 = cls.metadata4.copy()
return {
- "home1": {
- "calendar_1": {
- "1.ics": (cal1Root.child("1.ics").getContent(), metadata1),
- "2.ics": (cal1Root.child("2.ics").getContent(), metadata2),
- "3.ics": (cal1Root.child("3.ics").getContent(), metadata3),
- "4.ics": (cal1Root.child("4.ics").getContent(), metadata4),
+ "home1": {
+ "calendar_1": {
+ "1.ics": (cal1Root.child("1.ics").getContent(), metadata1),
+ "2.ics": (cal1Root.child("2.ics").getContent(), metadata2),
+ "3.ics": (cal1Root.child("3.ics").getContent(), metadata3),
+ "4.ics": (cal1Root.child("4.ics").getContent(), metadata4),
+ },
},
- },
- }
+ }
def storeUnderTest(self):
@@ -291,9 +291,8 @@
"""
cal = yield self.calendarUnderTest()
yield cal.createCalendarObjectWithName("drop.ics", Component.fromString(
- self.eventWithDropbox
- )
- )
+ self.eventWithDropbox
+ ))
obj = yield cal.calendarObjectWithName("drop.ics")
self.assertEquals((yield obj.dropboxID()), "some-dropbox-id")
@@ -1706,7 +1705,7 @@
txn = self._sqlCalendarStore.newTransaction()
calstore = CalendarStoreFeatures(self._sqlCalendarStore)
- for dropbox_id, result_count, result_names in (
+ for dropbox_id, result_count, result_names in (
("1.2", 1, ("1.2.ics",)),
("1.3", 2, ("1.3.ics", "2-2.3.ics",)),
("1.4", 4, ("1.4.ics", "1.5.ics", "2-3.2.ics", "2-3.3.ics",)),
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_implicit.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_implicit.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_implicit.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -54,19 +54,19 @@
@classproperty(cache=False)
def requirements(cls): #@NoSelf
return {
- "user01": {
- "calendar_1": {
+ "user01": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
+ "user02": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- },
- "user02": {
- "calendar_1": {
- },
- "inbox": {
- },
- },
- }
+ }
def storeUnderTest(self):
@@ -183,7 +183,7 @@
END:VCALENDAR
"""),
- Component.fromString("""BEGIN:VCALENDAR
+ Component.fromString("""BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
METHOD:PUBLISH
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_index_file.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_index_file.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_index_file.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -469,17 +469,17 @@
# Create fake filter element to match time-range
filter = caldavxml.Filter(
- caldavxml.ComponentFilter(
- caldavxml.ComponentFilter(
- TimeRange(
- start=trstart,
- end=trend,
- ),
- name=("VEVENT", "VFREEBUSY", "VAVAILABILITY"),
- ),
- name="VCALENDAR",
- )
- )
+ caldavxml.ComponentFilter(
+ caldavxml.ComponentFilter(
+ TimeRange(
+ start=trstart,
+ end=trend,
+ ),
+ name=("VEVENT", "VFREEBUSY", "VAVAILABILITY"),
+ ),
+ name="VCALENDAR",
+ )
+ )
filter = Filter(filter)
resources = yield self.db.indexedSearch(filter)
@@ -655,17 +655,17 @@
# Create fake filter element to match time-range
filter = caldavxml.Filter(
- caldavxml.ComponentFilter(
- caldavxml.ComponentFilter(
- TimeRange(
- start=trstart,
- end=trend,
- ),
- name=("VEVENT", "VFREEBUSY", "VAVAILABILITY"),
- ),
- name="VCALENDAR",
- )
- )
+ caldavxml.ComponentFilter(
+ caldavxml.ComponentFilter(
+ TimeRange(
+ start=trstart,
+ end=trend,
+ ),
+ name=("VEVENT", "VFREEBUSY", "VAVAILABILITY"),
+ ),
+ name="VCALENDAR",
+ )
+ )
filter = Filter(filter)
resources = yield self.db.indexedSearch(filter, fbtype=True)
@@ -1062,17 +1062,17 @@
# Create fake filter element to match time-range
filter = caldavxml.Filter(
- caldavxml.ComponentFilter(
- caldavxml.ComponentFilter(
- TimeRange(
- start=trstart,
- end=trend,
- ),
- name=("VEVENT", "VFREEBUSY", "VAVAILABILITY"),
- ),
- name="VCALENDAR",
- )
- )
+ caldavxml.ComponentFilter(
+ caldavxml.ComponentFilter(
+ TimeRange(
+ start=trstart,
+ end=trend,
+ ),
+ name=("VEVENT", "VFREEBUSY", "VAVAILABILITY"),
+ ),
+ name="VCALENDAR",
+ )
+ )
filter = Filter(filter)
for useruid, instances in peruserinstances:
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_queue_scheduling.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_queue_scheduling.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_queue_scheduling.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -45,25 +45,25 @@
@classproperty(cache=False)
def requirements(cls): #@NoSelf
return {
- "user01": {
- "calendar": {
+ "user01": {
+ "calendar": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
+ "user02": {
+ "calendar": {
+ },
+ "inbox": {
+ },
},
- },
- "user02": {
- "calendar": {
+ "user03": {
+ "calendar": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
- },
- },
- "user03": {
- "calendar": {
- },
- "inbox": {
- },
- },
- }
+ }
@inlineCallbacks
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_external.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_external.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_external.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -59,26 +59,26 @@
@classproperty(cache=False)
def requirements(cls): #@NoSelf
return {
- "user01": {
- "calendar": {
- "cal1.ics": (cls.cal1, None,),
+ "user01": {
+ "calendar": {
+ "cal1.ics": (cls.cal1, None,),
+ },
+ "inbox": {
+ },
},
- "inbox": {
+ "user02": {
+ "calendar": {
+ },
+ "inbox": {
+ },
},
- },
- "user02": {
- "calendar": {
+ "user03": {
+ "calendar": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
- },
- },
- "user03": {
- "calendar": {
- },
- "inbox": {
- },
- },
- }
+ }
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_sharing.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_sharing.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql_sharing.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -71,26 +71,26 @@
@classproperty(cache=False)
def requirements(cls): #@NoSelf
return {
- "user01": {
- "calendar": {
- "cal1.ics": (cls.cal1, None,),
+ "user01": {
+ "calendar": {
+ "cal1.ics": (cls.cal1, None,),
+ },
+ "inbox": {
+ },
},
- "inbox": {
+ "user02": {
+ "calendar": {
+ },
+ "inbox": {
+ },
},
- },
- "user02": {
- "calendar": {
+ "user03": {
+ "calendar": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
- },
- },
- "user03": {
- "calendar": {
- },
- "inbox": {
- },
- },
- }
+ }
def storeUnderTest(self):
@@ -602,7 +602,7 @@
)
yield self.buildStoreAndDirectory(
accounts=accountsFilePath.child("groupShareeAccounts.xml"),
- #resources=accountsFilePath.child("resources.xml"),
+ # resources=accountsFilePath.child("resources.xml"),
)
yield self.populate()
@@ -1805,15 +1805,14 @@
self.assertEqual(len(invalid), 0)
for depth, result in (
- ("1", [otherCal.name() + '/',
- 'calendar/',
- 'inbox/'],
- ),
- ("infinity", [otherCal.name() + '/',
- otherCal.name() + '/cal1.ics',
- 'calendar/',
- 'inbox/'],
- )):
+ ("1", [otherCal.name() + '/', 'calendar/', 'inbox/'],),
+ (
+ "infinity", [
+ otherCal.name() + '/', otherCal.name() + '/cal1.ics',
+ 'calendar/', 'inbox/'
+ ],
+ )
+ ):
changed, deleted, invalid = yield otherHome.resourceNamesSinceRevision(0, depth)
self.assertEqual(set(changed), set(result))
self.assertEqual(len(deleted), 0)
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/util.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/util.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/util.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -45,28 +45,28 @@
@classproperty(cache=False)
def requirements(cls): #@NoSelf
return {
- "user01": {
- "calendar_1": {
+ "user01": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
+ "user02": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- },
- "user02": {
- "calendar_1": {
+ "user03": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- "inbox": {
+ "user04": {
+ "calendar_1": {
+ },
+ "inbox": {
+ },
},
- },
- "user03": {
- "calendar_1": {
- },
- "inbox": {
- },
- },
- "user04": {
- "calendar_1": {
- },
- "inbox": {
- },
- },
- }
+ }
Modified: CalendarServer/trunk/txdav/caldav/datastore/util.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/util.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/datastore/util.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -141,8 +141,7 @@
"""
# Try "X-APPLE-DROPBOX" first
- dropboxProperty = (yield calendarObject.component(
- )).getFirstPropertyInAnyComponent("X-APPLE-DROPBOX")
+ dropboxProperty = (yield calendarObject.component()).getFirstPropertyInAnyComponent("X-APPLE-DROPBOX")
if dropboxProperty is not None and dropboxProperty.value():
componentDropboxID = dropboxProperty.value().rstrip("/").split("/")[-1]
returnValue(componentDropboxID)
Modified: CalendarServer/trunk/txdav/caldav/icalendarstore.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/icalendarstore.py 2014-07-27 17:05:00 UTC (rev 13798)
+++ CalendarServer/trunk/txdav/caldav/icalendarstore.py 2014-07-28 15:18:44 UTC (rev 13799)
@@ -38,7 +38,7 @@
"IAttachment",
# Exceptions
- #"InvalidCalendarComponentError",
+ # "InvalidCalendarComponentError",
"InvalidCalendarAccessError",
"TooManyAttendeesError",
"ResourceDeletedError",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140728/5bb807f3/attachment-0001.html>
More information about the calendarserver-changes
mailing list