Fix new flake8 warnings

12 files changed, 23 insertions, 51 deletions

diff --git a/openid/consumer/consumer.py b/openid/consumer/consumer.py
index e138477..86acd8f 100644
--- a/openid/consumer/consumer.py
+++ b/openid/consumer/consumer.py
@@ -909,8 +909,7 @@ class GenericConsumer(object):
             raise ProtocolError(
                 'openid.identity is present without openid.claimed_id')
 
-        elif (to_match.claimed_id is not None and
-              to_match.local_id is None):
+        elif (to_match.claimed_id is not None and to_match.local_id is None):
             raise ProtocolError(
                 'openid.claimed_id is present without openid.identity')
 
@@ -1793,11 +1792,11 @@ class SuccessResponse(Response):
 
     def __eq__(self, other):
         return (
-            (self.endpoint == other.endpoint) and
-            (self.identity_url == other.identity_url) and
-            (self.message == other.message) and
-            (self.signed_fields == other.signed_fields) and
-            (self.status == other.status))
+            self.endpoint == other.endpoint
+            and self.identity_url == other.identity_url
+            and self.message == other.message
+            and self.signed_fields == other.signed_fields
+            and self.status == other.status)
 
     def __ne__(self, other):
         return not (self == other)
diff --git a/openid/extensions/ax.py b/openid/extensions/ax.py
index 79856f7..e6ccaf2 100644
--- a/openid/extensions/ax.py
+++ b/openid/extensions/ax.py
@@ -312,8 +312,7 @@ class FetchRequest(AXMessage):
                                    message.getArg(OPENID_NS, 'return_to'))
 
             if not realm:
-                raise AXError(("Cannot validate update_url %r " +
-                               "against absent realm") % (self.update_url,))
+                raise AXError("Cannot validate update_url %r against absent realm" % self.update_url)
 
             tr = TrustRoot.parse(realm)
             if not tr.validateURL(self.update_url):
diff --git a/openid/extensions/draft/pape2.py b/openid/extensions/draft/pape2.py
index e8dec91..6e7e456 100644
--- a/openid/extensions/draft/pape2.py
+++ b/openid/extensions/draft/pape2.py
@@ -35,7 +35,7 @@ AUTH_MULTI_FACTOR = \
 AUTH_PHISHING_RESISTANT = \
     'http://schemas.openid.net/pape/policies/2007/06/phishing-resistant'
 
-TIME_VALIDATOR = re.compile('^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ$')
+TIME_VALIDATOR = re.compile(r'^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ$')
 
 
 class Request(Extension):
@@ -63,8 +63,7 @@ class Request(Extension):
         self.max_auth_age = max_auth_age
 
     def __bool__(self):
-        return bool(self.preferred_auth_policies or
-                    self.max_auth_age is not None)
+        return bool(self.preferred_auth_policies or self.max_auth_age is not None)
 
     def __nonzero__(self):
         return self.__bool__()
diff --git a/openid/extensions/pape.py b/openid/extensions/pape.py
index 56a0b92..b2543fa 100644
--- a/openid/extensions/pape.py
+++ b/openid/extensions/pape.py
@@ -36,7 +36,7 @@ AUTH_PHISHING_RESISTANT = \
 AUTH_NONE = \
     'http://schemas.openid.net/pape/policies/2007/06/none'
 
-TIME_VALIDATOR = re.compile('^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ$')
+TIME_VALIDATOR = re.compile(r'^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ$')
 
 LEVELS_NIST = 'http://csrc.nist.gov/publications/nistpubs/800-63/SP800-63V1_0_2.pdf'
 LEVELS_JISA = 'http://www.jisa.or.jp/spec/auth_level.html'
@@ -131,9 +131,7 @@ class Request(PAPEExtension):
                 self.addAuthLevel(auth_level)
 
     def __bool__(self):
-        return bool(self.preferred_auth_policies or
-                    self.max_auth_age is not None or
-                    self.preferred_auth_level_types)
+        return bool(self.preferred_auth_policies or self.max_auth_age is not None or self.preferred_auth_level_types)
 
     def __nonzero__(self):
         return self.__bool__()
diff --git a/openid/extensions/sreg.py b/openid/extensions/sreg.py
index a90e4d4..543a8b4 100644
--- a/openid/extensions/sreg.py
+++ b/openid/extensions/sreg.py
@@ -110,8 +110,7 @@ def supportsSReg(endpoint):
     @returns: Whether an sreg type was advertised by the endpoint
     @rtype: bool
     """
-    return (endpoint.usesExtension(ns_uri_1_1) or
-            endpoint.usesExtension(ns_uri_1_0))
+    return (endpoint.usesExtension(ns_uri_1_1) or endpoint.usesExtension(ns_uri_1_0))
 
 
 class SRegNamespaceError(ValueError):
@@ -294,8 +293,7 @@ class SRegRequest(Extension):
 
     def __contains__(self, field_name):
         """Was this field in the request?"""
-        return (field_name in self.required or
-                field_name in self.optional)
+        return (field_name in self.required or field_name in self.optional)
 
     def requestField(self, field_name, required=False, strict=False):
         """Request the specified field from the OpenID user
diff --git a/openid/server/server.py b/openid/server/server.py
index cf23c82..95b847c 100644
--- a/openid/server/server.py
+++ b/openid/server/server.py
@@ -367,9 +367,7 @@ class DiffieHellmanSHA1ServerSession(object):
         """
         dh_modulus = message.getArg(OPENID_NS, 'dh_modulus')
         dh_gen = message.getArg(OPENID_NS, 'dh_gen')
-        if (dh_modulus is None and dh_gen is not None or
-                dh_gen is None and dh_modulus is not None):
-
+        if (dh_modulus is None and dh_gen is not None or dh_gen is None and dh_modulus is not None):
             if dh_modulus is None:
                 missing = 'modulus'
             else:
@@ -515,8 +513,7 @@ class AssociateRequest(OpenIDRequest):
         response.fields.updateArgs(OPENID_NS,
                                    self.session.answer(assoc.secret))
 
-        if not (self.session.session_type == 'no-encryption' and
-                self.message.isOpenID1()):
+        if not (self.session.session_type == 'no-encryption' and self.message.isOpenID1()):
             # The session type "no-encryption" did not have a name
             # in OpenID v1, it was just omitted.
             response.fields.setArg(
diff --git a/openid/server/trustroot.py b/openid/server/trustroot.py
index db48ed8..159b60d 100644
--- a/openid/server/trustroot.py
+++ b/openid/server/trustroot.py
@@ -206,8 +206,7 @@ class TrustRoot(object):
         if not self.wildcard:
             if host != self.host:
                 return False
-        elif ((not host.endswith(self.host)) and
-              ('.' + host) != self.host):
+        elif ((not host.endswith(self.host)) and ('.' + host) != self.host):
             return False
 
         if path != self.path:
@@ -379,13 +378,13 @@ def returnToMatches(allowed_return_to_urls, return_to):
         return_realm = TrustRoot.parse(allowed_return_to)
         if (
             # Parses as a trust root
-            return_realm is not None and
+            return_realm is not None
 
             # Does not have a wildcard
-            not return_realm.wildcard and
+            and not return_realm.wildcard
 
             # Matches the return_to that we passed in with it
-            return_realm.validateURL(return_to)
+            and return_realm.validateURL(return_to)
         ):
             return True
 
diff --git a/openid/store/memstore.py b/openid/store/memstore.py
index 8d271d6..5587676 100644
--- a/openid/store/memstore.py
+++ b/openid/store/memstore.py
@@ -122,8 +122,7 @@ class MemoryStore(object):
         return removed_assocs
 
     def __eq__(self, other):
-        return ((self.server_assocs == other.server_assocs) and
-                (self.nonces == other.nonces))
+        return ((self.server_assocs == other.server_assocs) and (self.nonces == other.nonces))
 
     def __ne__(self, other):
         return not (self == other)
diff --git a/openid/store/sqlstore.py b/openid/store/sqlstore.py
index 8865e4f..2d3b0b8 100644
--- a/openid/store/sqlstore.py
+++ b/openid/store/sqlstore.py
@@ -115,8 +115,7 @@ class SQLStore(OpenIDStore):
         if hasattr(self.conn, 'IntegrityError') and hasattr(self.conn, 'OperationalError'):
             self.exceptions = self.conn
 
-        if not (hasattr(self.exceptions, 'IntegrityError') and
-                hasattr(self.exceptions, 'OperationalError')):
+        if not (hasattr(self.exceptions, 'IntegrityError') and hasattr(self.exceptions, 'OperationalError')):
             raise RuntimeError("Error using database connection module "
                                "(Maybe it can't be imported?)")
 
diff --git a/openid/test/test_server.py b/openid/test/test_server.py
index c522e08..f35a8bf 100644
--- a/openid/test/test_server.py
+++ b/openid/test/test_server.py
@@ -486,20 +486,6 @@ class TestDecode(unittest.TestCase):
         }
         self.assertRaises(server.ProtocolError, self.decode, args)
 
-
-#     def test_associateDHInvalidModGen(self):
-#         # test dh with properly encoded values that are not a valid
-#         #   modulus/generator combination.
-#         args = {
-#             'openid.mode': 'associate',
-#             'openid.session_type': 'DH-SHA1',
-#             'openid.dh_consumer_public': "Rzup9265tw==",
-#             'openid.dh_modulus': cryptutil.longToBase64(9),
-#             'openid.dh_gen': cryptutil.longToBase64(27) ,
-#             }
-#         self.assertRaises(server.ProtocolError, self.decode, args)
-#     test_associateDHInvalidModGen.todo = "low-priority feature"
-
     def test_associateWeirdSession(self):
         args = {
             'openid.mode': 'associate',
diff --git a/openid/yadis/discover.py b/openid/yadis/discover.py
index 769fb74..c4678a7 100644
--- a/openid/yadis/discover.py
+++ b/openid/yadis/discover.py
@@ -52,8 +52,7 @@ class DiscoveryResult(object):
 
     def isXRDS(self):
         """Is the response text supposed to be an XRDS document?"""
-        return (self.usedYadisLocation() or
-                self.content_type == YADIS_CONTENT_TYPE)
+        return (self.usedYadisLocation() or self.content_type == YADIS_CONTENT_TYPE)
 
 
 def discover(uri):
diff --git a/openid/yadis/xri.py b/openid/yadis/xri.py
index 2924f35..4712c6d 100644
--- a/openid/yadis/xri.py
+++ b/openid/yadis/xri.py
@@ -34,7 +34,7 @@ def toIRINormal(xri):
     return escapeForIRI(xri)
 
 
-_xref_re = re.compile('\((.*?)\)')
+_xref_re = re.compile(r'\((.*?)\)')
 
 
 def _escape_xref(xref_match):