[CalendarServer-changes] [15509] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Apr 15 12:11:01 PDT 2016
Revision: 15509
http://trac.calendarserver.org//changeset/15509
Author: cdaboo at apple.com
Date: 2016-04-15 12:11:01 -0700 (Fri, 15 Apr 2016)
Log Message:
-----------
Whitespace.
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/webadmin/delegation.py
CalendarServer/trunk/calendarserver/webadmin/principals.py
CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
Modified: CalendarServer/trunk/calendarserver/webadmin/delegation.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/delegation.py 2016-04-14 14:56:55 UTC (rev 15508)
+++ CalendarServer/trunk/calendarserver/webadmin/delegation.py 2016-04-15 19:11:01 UTC (rev 15509)
@@ -208,10 +208,12 @@
return self.tag
+
def recordTitle(record):
return u"{} ({} {})".format(record.fullNames[0], record.recordType.description, record.uid)
+
class DetailsElement(Element):
def __init__(self, resourceId, principalResource, davPropertyName,
Modified: CalendarServer/trunk/calendarserver/webadmin/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/principals.py 2016-04-14 14:56:55 UTC (rev 15508)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py 2016-04-15 19:11:01 UTC (rev 15509)
@@ -352,7 +352,7 @@
u"uid": joinWithBR((record.uid,)),
u"guid": joinWithBR((record.guid,)),
u"recordType": joinWithBR((record.recordType,)),
- u"shortNames": joinWithBR(record.shortNames) if hasattr(record, "shortNames") else "",
+ u"shortNames": joinWithBR(record.shortNames) if hasattr(record, "shortNames") else "",
u"fullNames": joinWithBR(record.fullNames),
u"emailAddresses": joinWithBR(record.emailAddresses) if hasattr(record, "emailAddresses") else "",
u"calendarUserAddresses": joinWithBR(record.calendarUserAddresses),
Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py 2016-04-14 14:56:55 UTC (rev 15508)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py 2016-04-15 19:11:01 UTC (rev 15509)
@@ -1511,7 +1511,7 @@
@inlineCallbacks
def test_migrateAutoSchedule(self):
- self.patch(config.AugmentService, "params", {"xmlFiles":["augments.xml"]})
+ self.patch(config.AugmentService, "params", {"xmlFiles": ["augments.xml"]})
serviceClass = {
"xml": "twistedcaldav.directory.augment.AugmentXMLDB",
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160415/41749a93/attachment.html>
More information about the calendarserver-changes
mailing list