[CalendarServer-changes] [13284] twext/trunk/twext/who/opendirectory/_service.py

[source_changes at macosforge.org]

Revision: 13284
          http://trac.calendarserver.org//changeset/13284
Author:   wsanchez at apple.com
Date:     2014-04-15 14:17:20 -0700 (Tue, 15 Apr 2014)
Log Message:
-----------
cleanup

Modified Paths:
--------------
    twext/trunk/twext/who/opendirectory/_service.py

Modified: twext/trunk/twext/who/opendirectory/_service.py
===================================================================
--- twext/trunk/twext/who/opendirectory/_service.py	2014-04-15 21:15:22 UTC (rev 13283)
+++ twext/trunk/twext/who/opendirectory/_service.py	2014-04-15 21:17:20 UTC (rev 13284)
@@ -266,7 +266,7 @@
         )
 
 
-    def _queryStringAndRecordTypesFromCompoundExpression(self, expression, recordTypes):
+    def _queryStringFromCompoundExpression(self, expression, recordTypes):
         """
         Generates an OD query string from a compound expression.
 
@@ -284,7 +284,7 @@
 
         queryTokens = []
         for subExpression in expression.expressions:
-            queryToken, subExpRecordTypes = self._queryStringAndRecordTypesFromExpression(
+            queryToken, subExpRecordTypes = self._queryStringFromExpression(
                 subExpression, recordTypes
             )
             if subExpRecordTypes:
@@ -319,7 +319,7 @@
         return (u"".join(queryTokens), recordTypes)
 
 
-    def _queryStringAndRecordTypesFromExpression(self, expression, recordTypes=set(ODRecordType.iterconstants())):
+    def _queryStringFromExpression(self, expression, recordTypes=set(ODRecordType.iterconstants())):
         """
         Converts either a MatchExpression or a CompoundExpression into an LDAP
         query string.
@@ -341,7 +341,7 @@
             return (queryString, recordType if recordType else recordTypes)
 
         if isinstance(expression, CompoundExpression):
-            return self._queryStringAndRecordTypesFromCompoundExpression(
+            return self._queryStringFromCompoundExpression(
                 expression, recordTypes
             )
 
@@ -361,9 +361,7 @@
         @rtype: L{ODQuery}
         """
 
-        queryString, recordTypes = self._queryStringAndRecordTypesFromExpression(
-            expression,
-        )
+        queryString, recordTypes = self._queryStringFromExpression(expression)
         if not recordTypes:
             return None
 
@@ -372,17 +370,14 @@
         else:
             matchType = ODMatchType.any.value
 
-        attributes = [a.value for a in ODAttribute.iterconstants()]
-        maxResults = 0
-
         query, error = ODQuery.queryWithNode_forRecordTypes_attribute_matchType_queryValues_returnAttributes_maximumResults_error_(
             self.node,
             (t.value for t in recordTypes),
             None,
             matchType,
             queryString,
-            attributes,
-            maxResults,
+            [a.value for a in ODAttribute.iterconstants()],
+            0,
             None
         )
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140415/081fa207/attachment.html>