[CalendarServer-changes] [15766] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jul 14 07:03:11 PDT 2016
Revision: 15766
http://trac.calendarserver.org//changeset/15766
Author: cdaboo at apple.com
Date: 2016-07-14 07:03:11 -0700 (Thu, 14 Jul 2016)
Log Message:
-----------
Whitespace.
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tap/caldav.py
CalendarServer/trunk/calendarserver/tools/principals.py
CalendarServer/trunk/calendarserver/tools/util.py
CalendarServer/trunk/txdav/caldav/icalendardirectoryservice.py
CalendarServer/trunk/txdav/dps/commands.py
CalendarServer/trunk/txdav/dps/server.py
CalendarServer/trunk/txdav/who/test/test_directory.py
Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2016-07-14 14:03:11 UTC (rev 15766)
@@ -865,7 +865,7 @@
)
if config.Manhole.Enabled:
- namespace= dict({service.name: service})
+ namespace = dict({service.name: service})
for n, s in service.namedServices.iteritems():
namespace[n] = s
self._makeManhole(namespace=namespace, parent=service)
@@ -1194,7 +1194,7 @@
inherit=False
)
httpsService.setName(
- "https-{}:{}".format(bindAddress,int(port)))
+ "https-{}:{}".format(bindAddress, int(port)))
httpsService.setServiceParent(connectionService)
for port in config.BindHTTPPorts:
@@ -1346,8 +1346,8 @@
"Set Manhole.UseSSH to false or rebuild CS with the "
"USE_OPENSSL environment variable set."
)
-
+
def makeService_Single(self, options):
"""
Create a service to be used in a single-process, stand-alone
@@ -1893,7 +1893,6 @@
statsService.setServiceParent(s)
-
# Finally, let's get the real show on the road. Create a service that
# will spawn all of our worker processes when started, and wrap that
# service in zero to two necessary layers before it's started: first,
Modified: CalendarServer/trunk/calendarserver/tools/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/principals.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/calendarserver/tools/principals.py 2016-07-14 14:03:11 UTC (rev 15766)
@@ -603,10 +603,6 @@
-
-
-
-
@inlineCallbacks
def action_listGroupMembers(store, record):
members = yield record.members()
Modified: CalendarServer/trunk/calendarserver/tools/util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/util.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/calendarserver/tools/util.py 2016-07-14 14:03:11 UTC (rev 15766)
@@ -339,6 +339,7 @@
raise ValueError("Invalid principal identifier: %s" % (principalID,))
+
@inlineCallbacks
def _addRemoveProxy(msg, fn, store, record, proxyType, *proxyIDs):
directory = store.directoryService()
@@ -390,6 +391,7 @@
yield _addRemoveProxy("Removed", Delegates.removeDelegate, store, record, "read", *proxyIDs)
+
@inlineCallbacks
def setProxies(record, readProxyRecords, writeProxyRecords):
"""
@@ -438,6 +440,7 @@
)
+
def proxySubprincipal(principal, proxyType):
return principal.getChild("calendar-proxy-" + proxyType)
Modified: CalendarServer/trunk/txdav/caldav/icalendardirectoryservice.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/icalendardirectoryservice.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/txdav/caldav/icalendardirectoryservice.py 2016-07-14 14:03:11 UTC (rev 15766)
@@ -114,7 +114,6 @@
@type autoScheduleMode: L{AutoScheduleMode}
"""
-
def isProxyFor(other): #@NoSelf
"""
Test whether the record is a calendar user proxy for the specified record.
Modified: CalendarServer/trunk/txdav/dps/commands.py
===================================================================
--- CalendarServer/trunk/txdav/dps/commands.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/txdav/dps/commands.py 2016-07-14 14:03:11 UTC (rev 15766)
@@ -265,6 +265,7 @@
]
+
class SetAutoScheduleModeCommand(amp.Command):
arguments = [
('uid', amp.String()),
@@ -275,6 +276,7 @@
]
+
class FlushCommand(amp.Command):
arguments = []
response = [
Modified: CalendarServer/trunk/txdav/dps/server.py
===================================================================
--- CalendarServer/trunk/txdav/dps/server.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/txdav/dps/server.py 2016-07-14 14:03:11 UTC (rev 15766)
@@ -556,7 +556,6 @@
returnValue(response)
-
@GroupsCommand.responder
@inlineCallbacks
def groups(self, uid):
Modified: CalendarServer/trunk/txdav/who/test/test_directory.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_directory.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/txdav/who/test/test_directory.py 2016-07-14 14:03:11 UTC (rev 15766)
@@ -374,6 +374,7 @@
self.assertEquals(orion.autoScheduleMode, AutoScheduleMode.declineIfBusy)
+
class DirectoryTestCaseFakeEmail(StoreTestCase):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160714/029cfabb/attachment-0001.html>
More information about the calendarserver-changes
mailing list