[CalendarServer-changes] [13976] twext/trunk/twext/who

[source_changes at macosforge.org]

Revision: 13976
          http://trac.calendarserver.org//changeset/13976
Author:   cdaboo at apple.com
Date:     2014-09-18 07:33:43 -0700 (Thu, 18 Sep 2014)
Log Message:
-----------
Whitespace.

Modified Paths:
--------------
    twext/trunk/twext/who/expression.py
    twext/trunk/twext/who/ldap/_service.py
    twext/trunk/twext/who/ldap/_util.py
    twext/trunk/twext/who/ldap/test/test_util.py

Modified: twext/trunk/twext/who/expression.py
===================================================================
--- twext/trunk/twext/who/expression.py	2014-09-18 00:15:38 UTC (rev 13975)
+++ twext/trunk/twext/who/expression.py	2014-09-18 14:33:43 UTC (rev 13976)
@@ -337,6 +337,7 @@
         ))
 
 
+
 class ExistsExpression(object):
     """
     Query for the existence a given field.
@@ -371,6 +372,7 @@
             return NotImplemented
 
 
+
 class BooleanExpression(object):
     """
     Query for the "True" value of a given field.

Modified: twext/trunk/twext/who/ldap/_service.py
===================================================================
--- twext/trunk/twext/who/ldap/_service.py	2014-09-18 00:15:38 UTC (rev 13975)
+++ twext/trunk/twext/who/ldap/_service.py	2014-09-18 14:33:43 UTC (rev 13976)
@@ -26,7 +26,6 @@
 from uuid import UUID
 
 import collections
-import ldap
 import ldap.async
 
 from twisted.python.constants import Names, NamedConstant
@@ -660,7 +659,7 @@
                     )
                     raise LDAPQueryError("Unable to perform query", e)
 
-                reply = [resultItem for resultType, resultItem in s.allResults]
+                reply = [resultItem for _ignore_resultType, resultItem in s.allResults]
 
                 newRecords = self._recordsFromReply(reply, recordType=recordType)
 
@@ -1007,6 +1006,7 @@
     return ' '.join(ldap.dn.dn2str(ldap.dn.str2dn(dnStr.lower())).split())
 
 
+
 def reverseDict(source):
     new = {}
 

Modified: twext/trunk/twext/who/ldap/_util.py
===================================================================
--- twext/trunk/twext/who/ldap/_util.py	2014-09-18 00:15:38 UTC (rev 13975)
+++ twext/trunk/twext/who/ldap/_util.py	2014-09-18 14:33:43 UTC (rev 13976)
@@ -154,6 +154,7 @@
     raise AssertionError("We shouldn't be here.")
 
 
+
 def ldapQueryStringFromExistsExpression(
     expression, fieldNameToAttributesMap, recordTypeSchemas
 ):
@@ -197,6 +198,7 @@
     return ldapQueryStringFromQueryStrings(operand, queryStrings)
 
 
+
 def ldapQueryStringFromBooleanExpression(
     expression, fieldNameToAttributesMap, recordTypeSchemas
 ):
@@ -250,6 +252,7 @@
     return ldapQueryStringFromQueryStrings(operand, queryStrings)
 
 
+
 def ldapQueryStringFromCompoundExpression(
     expression, fieldNameToAttributesMap, recordTypeSchemas
 ):

Modified: twext/trunk/twext/who/ldap/test/test_util.py
===================================================================
--- twext/trunk/twext/who/ldap/test/test_util.py	2014-09-18 00:15:38 UTC (rev 13975)
+++ twext/trunk/twext/who/ldap/test/test_util.py	2014-09-18 14:33:43 UTC (rev 13976)
@@ -55,6 +55,7 @@
     isCool.valueType = bool
 
 
+
 class LDAPQueryTestCase(unittest.TestCase):
     """
     Tests for LDAP query generation.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140918/9d7d11ee/attachment-0001.html>