[CalendarServer-changes] [12644] CalendarServer/trunk/txdav
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:19:02 PDT 2014
Revision: 12644
http://trac.calendarserver.org//changeset/12644
Author: cdaboo at apple.com
Date: 2014-02-11 06:56:20 -0800 (Tue, 11 Feb 2014)
Log Message:
-----------
Cosmetic.
Modified Paths:
--------------
CalendarServer/trunk/txdav/dps/client.py
CalendarServer/trunk/txdav/dps/commands.py
CalendarServer/trunk/txdav/dps/server.py
CalendarServer/trunk/txdav/who/idirectory.py
Modified: CalendarServer/trunk/txdav/dps/client.py
===================================================================
--- CalendarServer/trunk/txdav/dps/client.py 2014-02-11 04:08:40 UTC (rev 12643)
+++ CalendarServer/trunk/txdav/dps/client.py 2014-02-11 14:56:20 UTC (rev 12644)
@@ -117,7 +117,7 @@
@type command: L{twisted.protocols.amp.Command}
@param postProcess: a callable which takes the AMP response dictionary
- and peforms any required massaging of the results, returning a
+ and performs any required massaging of the results, returning a
L{Deferred} which fires with the post-processed results
@type postProcess: callable
"""
@@ -227,11 +227,13 @@
"""
+
def succeeded(result):
print("yay")
reactor.stop()
+
def failed(failure):
print("boo: {f}".format(f=failure))
reactor.stop()
Modified: CalendarServer/trunk/txdav/dps/commands.py
===================================================================
--- CalendarServer/trunk/txdav/dps/commands.py 2014-02-11 04:08:40 UTC (rev 12643)
+++ CalendarServer/trunk/txdav/dps/commands.py 2014-02-11 14:56:20 UTC (rev 12644)
@@ -27,6 +27,7 @@
]
+
class RecordWithUIDCommand(amp.Command):
arguments = [
('uid', amp.String()),
@@ -36,6 +37,7 @@
]
+
class RecordWithGUIDCommand(amp.Command):
arguments = [
('guid', amp.String()),
@@ -45,6 +47,7 @@
]
+
class RecordsWithRecordTypeCommand(amp.Command):
arguments = [
('recordType', amp.String()),
@@ -54,6 +57,7 @@
]
+
class RecordsWithEmailAddressCommand(amp.Command):
arguments = [
('emailAddress', amp.String()),
@@ -63,6 +67,7 @@
]
+
class UpdateRecordsCommand(amp.Command):
arguments = [
('fieldsList', amp.String()),
@@ -73,6 +78,7 @@
]
+
class RemoveRecordsCommand(amp.Command):
arguments = [
('uids', amp.ListOf(amp.String())),
@@ -82,6 +88,7 @@
]
+
class VerifyPlaintextPasswordCommand(amp.Command):
arguments = [
('uid', amp.String()),
@@ -92,6 +99,7 @@
]
+
class VerifyHTTPDigestCommand(amp.Command):
arguments = [
('uid', amp.String()),
Modified: CalendarServer/trunk/txdav/dps/server.py
===================================================================
--- CalendarServer/trunk/txdav/dps/server.py 2014-02-11 04:08:40 UTC (rev 12643)
+++ CalendarServer/trunk/txdav/dps/server.py 2014-02-11 14:56:20 UTC (rev 12644)
@@ -210,7 +210,6 @@
-
class DirectoryProxyAMPFactory(Factory):
"""
"""
@@ -220,13 +219,12 @@
def __init__(self, directory):
self._directory = directory
+
def buildProtocol(self, addr):
return DirectoryProxyAMPProtocol(self._directory)
-
-
class DirectoryProxyOptions(Options):
optParameters = [[
"config", "f", DEFAULT_CONFIG_FILE, "Path to configuration file."
@@ -292,7 +290,7 @@
def opt_option(self, option):
"""
Set an option to override a value in the config file. True, False, int,
- and float options are supported, as well as comma seperated lists. Only
+ and float options are supported, as well as comma separated lists. Only
one option may be given for each --option flag, however multiple
--option flags may be specified.
"""
@@ -316,6 +314,7 @@
self.parent['pidfile'] = None
+
@implementer(IPlugin, service.IServiceMaker)
class DirectoryProxyServiceMaker(object):
Modified: CalendarServer/trunk/txdav/who/idirectory.py
===================================================================
--- CalendarServer/trunk/txdav/who/idirectory.py 2014-02-11 04:08:40 UTC (rev 12643)
+++ CalendarServer/trunk/txdav/who/idirectory.py 2014-02-11 14:56:20 UTC (rev 12644)
@@ -19,7 +19,7 @@
from __future__ import absolute_import
"""
-Calendar and contacts directory extentions to L{twext.who.idirectory}.
+Calendar and contacts directory extensions to L{twext.who.idirectory}.
"""
__all__ = [
@@ -92,7 +92,7 @@
"""
location = NamedConstant()
- location.description = u"location"
+ location.description = u"location"
resource = NamedConstant()
resource.description = u"resource"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/9d6db0f2/attachment.html>
More information about the calendarserver-changes
mailing list