Formatting to be flake8 compliant

Author: skoranda

src/satosa/internal_data.py

@@ -67,7 +67,8 @@ def hash_type(state):
     @staticmethod
     def hash_id(salt, user_id, requester, state):
         """
-        Sets a user id to the internal_response, in the format specified by the internal response
+        Sets a user id to the internal_response,
+        in the format specified by the internal response
 
         :type salt: str
         :type user_id: str
@@ -84,13 +85,15 @@ def hash_id(salt, user_id, requester, state):
         hash_type = UserIdHasher.hash_type(state)
         if hash_type == UserIdHashType.transient:
             timestamp = datetime.datetime.now().time()
-            user_id = "{req}{time}{id}".format(req=requester, time=timestamp, id=user_id)
-        elif hash_type == UserIdHashType.persistent or hash_type == UserIdHashType.pairwise:
+            user_id = "{req}{time}{id}".format(req=requester, time=timestamp,
+                                               id=user_id)
+        elif (hash_type == UserIdHashType.persistent or
+              hash_type == UserIdHashType.pairwise):
             user_id = "{req}{id}".format(req=requester, id=user_id)
         elif hash_type == UserIdHashType.public:
             user_id = "{id}".format(id=user_id)
-        elif hash_type == UserIdHashType.emailaddress or \
-             hash_type == UserIdHashType.unspecified:
+        elif (hash_type == UserIdHashType.emailaddress or
+              hash_type == UserIdHashType.unspecified):
             return user_id
         else:
             raise ValueError("Unknown hash type: '{}'".format(hash_type))

tests/satosa/frontends/test_saml2.py

@@ -360,16 +360,21 @@ def test_load_idp_dynamic_entity_id(self, idp_conf):
 
 class TestSamlNameIdFormatToHashType:
     def test_should_default_to_transient(self):
-        assert saml_name_id_format_to_hash_type("foobar") == UserIdHashType.transient
+        assert (saml_name_id_format_to_hash_type("foobar") ==
+                UserIdHashType.transient)
 
     def test_should_map_transient(self):
-        assert saml_name_id_format_to_hash_type(NAMEID_FORMAT_TRANSIENT) == UserIdHashType.transient
+        assert (saml_name_id_format_to_hash_type(NAMEID_FORMAT_TRANSIENT) ==
+                UserIdHashType.transient)
 
     def test_should_map_persistent(self):
-        assert saml_name_id_format_to_hash_type(NAMEID_FORMAT_PERSISTENT) == UserIdHashType.persistent
+        assert (saml_name_id_format_to_hash_type(NAMEID_FORMAT_PERSISTENT) ==
+                UserIdHashType.persistent)
 
     def test_should_map_email(self):
-        assert saml_name_id_format_to_hash_type(NAMEID_FORMAT_EMAILADDRESS) == UserIdHashType.emailaddress
+        assert (saml_name_id_format_to_hash_type(NAMEID_FORMAT_EMAILADDRESS) ==
+                UserIdHashType.emailaddress)
 
     def test_should_map_unspecified(self):
-        assert saml_name_id_format_to_hash_type(NAMEID_FORMAT_UNSPECIFIED) == UserIdHashType.unspecified
+        assert (saml_name_id_format_to_hash_type(NAMEID_FORMAT_UNSPECIFIED) ==
+                UserIdHashType.unspecified)