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

[source_changes at macosforge.org]

Revision: 14203
          http://trac.calendarserver.org//changeset/14203
Author:   wsanchez at apple.com
Date:     2014-12-08 14:08:17 -0800 (Mon, 08 Dec 2014)
Log Message:
-----------
cosmetic

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-12-08 21:05:39 UTC (rev 14202)
+++ twext/trunk/twext/who/opendirectory/_service.py	2014-12-08 22:08:17 UTC (rev 14203)
@@ -481,7 +481,8 @@
         @param expression: A match expression.
         @type expression: L{MatchExpression}
 
-        @param recordTypes: Record types to insert into the query; None for no filtering.
+        @param recordTypes: Record types to insert into the query; None for no
+            filtering.
         @type recordTypes: iterable of L{NamedConstant}, or None
 
         @param local: Whether to restrict the query to the local node
@@ -525,7 +526,9 @@
             matchType = ODMatchType.any.value
             caseInsensitive = 0x0
 
-            odRecordTypes = [ODRecordType.fromRecordType(expression.fieldValue).value, ]
+            odRecordTypes = [
+                ODRecordType.fromRecordType(expression.fieldValue).value,
+            ]
         else:
             if MatchFlags.NOT in flags:
                 raise NotImplementedError()
@@ -533,7 +536,9 @@
             if recordTypes is None:
                 odRecordTypes = [t.value for t in ODRecordType.iterconstants()]
             else:
-                odRecordTypes = [ODRecordType.fromRecordType(r).value for r in recordTypes]
+                odRecordTypes = [
+                    ODRecordType.fromRecordType(r).value for r in recordTypes
+                ]
 
             queryAttribute = ODAttribute.fromFieldName(
                 expression.fieldName
@@ -564,7 +569,9 @@
 
         if not scrubbedRecordTypes:
             # None of the requested recordTypes are supported.
-            raise UnsupportedRecordTypeError(u",".join(r.name for r in recordTypes))
+            raise UnsupportedRecordTypeError(
+                u",".join(r.name for r in recordTypes)
+            )
 
         query, error = ODQuery.queryWithNode_forRecordTypes_attribute_matchType_queryValues_returnAttributes_maximumResults_error_(
             node,
@@ -727,7 +734,10 @@
         if isinstance(expression, MatchExpression):
             try:
                 query = self._queryFromMatchExpression(
-                    expression, recordTypes=recordTypes, limitResults=limitResults)
+                    expression,
+                    recordTypes=recordTypes,
+                    limitResults=limitResults,
+                )
                 return self._recordsFromQuery(
                     query, timeoutSeconds=timeoutSeconds
                 )
@@ -767,8 +777,11 @@
             returnValue(
                 (
                     yield BaseDirectoryService.recordsFromCompoundExpression(
-                        self, expression, recordTypes=recordTypes,
-                        limitResults=limitResults, timeoutSeconds=timeoutSeconds
+                        self,
+                        expression,
+                        recordTypes=recordTypes,
+                        limitResults=limitResults,
+                        timeoutSeconds=timeoutSeconds,
                     )
                 )
             )
@@ -1044,7 +1057,9 @@
                 )
             )
         else:
-            result, error = self._odRecord.verifyPassword_error_(password, None)
+            result, error = self._odRecord.verifyPassword_error_(
+                password, None
+            )
 
         if error:
             returnValue(False)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20141208/24c6c16a/attachment.html>