clean up.

Author: rohe

src/oidcrp/util.py

@@ -128,10 +128,9 @@ def get_http_body(req, content_type=URL_ENCODED):
     Get the message into the format that should be places in the body part
     of a HTTP request.
 
-    :param req: The service request as a  :py:class:`oidcmsg.message.Message`
-        instance
+    :param req: The service request as a :py:class:`oidcmsg.message.Message` instance
     :param content_type: The format of the body part.
-    :return: The correctly formatet service request.
+    :return: The correctly formatted service request.
     """
     if URL_ENCODED in content_type:
         return req.to_urlencoded()
@@ -142,8 +141,7 @@ def get_http_body(req, content_type=URL_ENCODED):
     if JOSE_ENCODED in content_type:
         return req  # already packaged
 
-    raise UnSupported(
-        "Unsupported content type: '%s'" % content_type)
+    raise UnSupported("Unsupported content type: '%s'" % content_type)
 
 
 def load_yaml_config(filename):

tests/test_40_rp_handler_persistent.py

@@ -23,22 +23,6 @@
     "verify_args": {"allow_sign_alg_none": True}
 }
 
-DB_CONF = {
-    'keyjar': {
-        'handler': 'oidcmsg.storage.abfile.LabeledAbstractFileSystem',
-        'fdir': 'db/{}/keyjar',
-        'key_conv': 'oidcmsg.storage.converter.QPKey',
-        'value_conv': 'cryptojwt.serialize.item.KeyIssuer',
-        'label': 'keyjar'
-    },
-    'default': {
-        'handler': 'oidcmsg.storage.abfile.AbstractFileSystem',
-        'fdir': 'db/{}',
-        'key_conv': 'oidcmsg.storage.converter.QPKey',
-        'value_conv': 'oidcmsg.storage.converter.JSON'
-    }
-}
-
 CLIENT_CONFIG = {
     "": {
         "client_preferences": CLIENT_PREFS,
@@ -97,8 +81,7 @@
             'userinfo': {
                 'class': 'oidcrp.provider.linkedin.UserInfo'
             }
-        },
-        'db_conf': DB_CONF
+        }
     },
     "facebook": {
         "issuer": "https://www.facebook.com/v2.11/dialog/oauth",
@@ -130,8 +113,7 @@
                 'class': 'oidcrp.oidc.userinfo.UserInfo',
                 'kwargs': {'conf': {'default_authn_method': ''}}
             }
-        },
-        'db_conf': DB_CONF
+        }
     },
     'github': {
         "issuer": "https://github.com/login/oauth/authorize",
@@ -167,8 +149,7 @@
                 'class': 'oidcrp.oidc.refresh_access_token'
                          '.RefreshAccessToken'
             }
-        },
-        'db_conf': DB_CONF
+        }
     }
 }
 
@@ -333,11 +314,11 @@ def test_begin(self):
                                      'redirect_uri', 'response_type', 'scope'}
 
         # nonce and state are created on the fly so can't check for those
-        assert query['client_id'] == ['eeeeeeeee']
-        assert query['redirect_uri'] == [
+        assert query[b'client_id'] == ['eeeeeeeee']
+        assert query[b'redirect_uri'] == [
             'https://example.com/rp/authz_cb/github']
-        assert query['response_type'] == ['code']
-        assert query['scope'] == ['user public_repo openid']
+        assert query[b'response_type'] == ['code']
+        assert query[b'scope'] == ['user public_repo openid']
 
     def test_get_session_information(self):
         rph_1 = RPHandler(BASE_URL, client_configs=CLIENT_CONFIG,