[CalendarServer-changes] [10579] CalendarServer/branches/users/glyph/unshare-when-access-revoked

[source_changes at macosforge.org]

Revision: 10579
          http://trac.calendarserver.org//changeset/10579
Author:   glyph at apple.com
Date:     2013-01-28 19:29:02 -0800 (Mon, 28 Jan 2013)
Log Message:
-----------
Epytext formatting fix; put body of documentation before fields.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/directory/aggregate.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/unshare-when-access-revoked/

Modified: CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/directory/aggregate.py
===================================================================
--- CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/directory/aggregate.py	2013-01-29 03:29:00 UTC (rev 10578)
+++ CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/directory/aggregate.py	2013-01-29 03:29:02 UTC (rev 10579)
@@ -187,24 +187,25 @@
     @inlineCallbacks
     def recordsMatchingTokens(self, tokens, context=None):
         """
+        Combine the results from the sub-services.
+
+        Each token is searched for within each record's full name and email
+        address; if each token is found within a record that record is returned
+        in the results.
+
+        If context is None, all record types are considered.  If context is
+        "location", only locations are considered.  If context is "attendee",
+        only users, groups, and resources are considered.
+
         @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; "attendee", "location", or None
+
+        @param context: An indication of what the end user is searching 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.
 
-        Each token is searched for within each record's full name and
-        email address; if each token is found within a record that
-        record is returned in the results.
-
-        If context is None, all record types are considered.  If
-        context is "location", only locations are considered.  If
-        context is "attendee", only users, groups, and resources
-        are considered.
-
-        Combine the results from the sub-services.
+        @return: a deferred sequence of L{IDirectoryRecord}s which match the
+            given tokens and optional context.
         """
 
         services = set(self._recordTypes.values())
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130128/8f7c9078/attachment-0001.html>