[CalendarServer-changes] [9556] CalendarServer/trunk/twistedcaldav/directory

[source_changes at macosforge.org]

Revision: 9556
          http://trac.macosforge.org/projects/calendarserver/changeset/9556
Author:   sagen at apple.com
Date:     2012-08-10 15:40:51 -0700 (Fri, 10 Aug 2012)
Log Message:
-----------
Make recordsMatchingTokens( ) docstrings explicitly state "context" can only be "attendee", "location", or None

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/aggregate.py
    CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
    CalendarServer/trunk/twistedcaldav/directory/directory.py
    CalendarServer/trunk/twistedcaldav/directory/idirectory.py
    CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py

Modified: CalendarServer/trunk/twistedcaldav/directory/aggregate.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/aggregate.py	2012-08-10 22:35:38 UTC (rev 9555)
+++ CalendarServer/trunk/twistedcaldav/directory/aggregate.py	2012-08-10 22:40:51 UTC (rev 9556)
@@ -171,7 +171,7 @@
         @param tokens: The tokens to search on
         @type tokens: C{list} of C{str} (utf-8 bytes)
         @param context: An indication of what the end user is searching
-            for, e.g. "attendee", "location"
+            for; "attendee", "location", or None
         @type context: C{str}
         @return: a deferred sequence of L{IDirectoryRecord}s which
             match the given tokens and optional context.

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2012-08-10 22:35:38 UTC (rev 9555)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2012-08-10 22:40:51 UTC (rev 9556)
@@ -535,7 +535,7 @@
         @param tokens: The tokens to search on
         @type tokens: C{list} of C{str} (utf-8 bytes)
         @param context: An indication of what the end user is searching
-            for, e.g. "attendee", "location"
+            for; "attendee", "location", or None
         @type context: C{str}
         @return: a deferred sequence of L{IDirectoryRecord}s which
             match the given tokens and optional context.

Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/directory.py	2012-08-10 22:35:38 UTC (rev 9555)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py	2012-08-10 22:40:51 UTC (rev 9556)
@@ -252,7 +252,7 @@
         @param tokens: The tokens to search on
         @type tokens: C{list} of C{str} (utf-8 bytes)
         @param context: An indication of what the end user is searching
-            for, e.g. "attendee", "location"
+            for; "attendee", "location", or None
         @type context: C{str}
         @return: a deferred sequence of L{IDirectoryRecord}s which
             match the given tokens and optional context.

Modified: CalendarServer/trunk/twistedcaldav/directory/idirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/idirectory.py	2012-08-10 22:35:38 UTC (rev 9555)
+++ CalendarServer/trunk/twistedcaldav/directory/idirectory.py	2012-08-10 22:40:51 UTC (rev 9556)
@@ -92,7 +92,7 @@
         @param tokens: The tokens to search on
         @type tokens: C{list} of C{str} (utf-8 bytes)
         @param context: An indication of what the end user is searching
-            for, e.g. "attendee", "location"
+            for; "attendee", "location", or None
         @type context: C{str}
         @return: a deferred sequence of L{IDirectoryRecord}s which
             match the given tokens and optional context.

Modified: CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py	2012-08-10 22:35:38 UTC (rev 9555)
+++ CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py	2012-08-10 22:40:51 UTC (rev 9556)
@@ -979,7 +979,7 @@
         @param tokens: The tokens to search on
         @type tokens: C{list} of C{str} (utf-8 bytes)
         @param context: An indication of what the end user is searching
-            for, e.g. "attendee", "location"
+            for; "attendee", "location", or None
         @type context: C{str}
         @return: a deferred sequence of L{IDirectoryRecord}s which
             match the given tokens and optional context.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120810/fbe1518b/attachment-0001.html>