PEP-8 for ldap.filter

stroeder · stroeder · commit 8692df7b740d · 2017-11-18T23:54:45.000Z
diff --git a/Lib/ldap/filter.py b/Lib/ldap/filter.py
@@ -1,60 +1,63 @@
 """
-filters.py - misc stuff for handling LDAP filter strings (see RFC2254)
+filters.py - misc stuff for handling LDAP filter strings (see RFC 4515)
 
-See https://www.python-ldap.org/ for details.
-
-Compability:
-- Tested with Python 2.0+
+See https://www.python-ldap.org/ for details
 """
 
+import time
+
 from ldap import __version__
 
 from ldap.functions import strf_secs
 
-import time
-
 
-def escape_filter_chars(assertion_value,escape_mode=0):
-  """
-  Replace all special characters found in assertion_value
-  by quoted notation.
+def escape_filter_chars(assertion_value, escape_mode=0):
+    """
+    Replace all special characters found in assertion_value
+    by quoted notation.
 
-  escape_mode
-      If 0 only special chars mentioned in RFC 4515 are escaped.
-      If 1 all NON-ASCII chars are escaped.
-      If 2 all chars are escaped.
-  """
-  if escape_mode:
-    r = []
-    if escape_mode==1:
-      for c in assertion_value:
-        if c < '0' or c > 'z' or c in "\\*()":
-          c = "\\%02x" % ord(c)
-        r.append(c)
-    elif escape_mode==2:
-      for c in assertion_value:
-        r.append("\\%02x" % ord(c))
+    escape_mode
+        If 0 only special chars mentioned in RFC 4515 are escaped.
+        If 1 all NON-ASCII chars are escaped.
+        If 2 all chars are escaped.
+    """
+    if escape_mode:
+        res = []
+        if escape_mode == 1:
+            for char in assertion_value:
+                if char < '0' or char > 'z' or char in "\\*()":
+                    char = "\\%02x" % ord(char)
+                res.append(char)
+        elif escape_mode == 2:
+            for char in assertion_value:
+                res.append("\\%02x" % ord(char))
+        else:
+            raise ValueError('escape_mode must be 0, 1 or 2.')
+        val = ''.join(res)
     else:
-      raise ValueError('escape_mode must be 0, 1 or 2.')
-    s = ''.join(r)
-  else:
-    s = assertion_value.replace('\\', r'\5c')
-    s = s.replace(r'*', r'\2a')
-    s = s.replace(r'(', r'\28')
-    s = s.replace(r')', r'\29')
-    s = s.replace('\x00', r'\00')
-  return s
+        val = assertion_value.replace(
+            '\\', r'\5c'
+        ).replace(
+            r'*', r'\2a'
+        ).replace(
+            r'(', r'\28'
+        ).replace(
+            r')', r'\29'
+        ).replace(
+            '\x00', r'\00'
+        )
+    return val
 
 
-def filter_format(filter_template,assertion_values):
-  """
-  filter_template
-        String containing %s as placeholder for assertion values.
-  assertion_values
-        List or tuple of assertion values. Length must match
-        count of %s in filter_template.
-  """
-  return filter_template % (tuple(map(escape_filter_chars,assertion_values)))
+def filter_format(filter_template, assertion_values):
+    """
+    filter_template
+          String containing %s as placeholder for assertion values.
+    assertion_values
+          List or tuple of assertion values. Length must match
+          count of %s in filter_template.
+    """
+    return filter_template % (tuple(map(escape_filter_chars, assertion_values)))
 
 
 def time_span_filter(
