Use full_path function.

Author: rohe

tests/test_5_oauth2.py

@@ -1,30 +1,29 @@
 # pylint: disable=no-self-use,missing-docstring
 
 import json
-from urllib.parse import urlparse, parse_qs
+from urllib.parse import parse_qs
+from urllib.parse import urlparse
 
 import pytest
-
 from cryptojwt.key_jar import build_keyjar
 
 from oidcmsg.exception import MissingRequiredAttribute
 from oidcmsg.message import DecodeError
 from oidcmsg.message import json_deserializer
 from oidcmsg.message import json_serializer
 from oidcmsg.message import sp_sep_list_deserializer
-
-from oidcmsg.oauth2 import factory
-from oidcmsg.oauth2 import is_error_message
 from oidcmsg.oauth2 import AccessTokenRequest
 from oidcmsg.oauth2 import AccessTokenResponse
 from oidcmsg.oauth2 import AuthorizationErrorResponse
 from oidcmsg.oauth2 import AuthorizationRequest
 from oidcmsg.oauth2 import AuthorizationResponse
 from oidcmsg.oauth2 import CCAccessTokenRequest
-from oidcmsg.oauth2 import ResponseMessage
-from oidcmsg.oauth2 import RefreshAccessTokenRequest
 from oidcmsg.oauth2 import ROPCAccessTokenRequest
+from oidcmsg.oauth2 import RefreshAccessTokenRequest
+from oidcmsg.oauth2 import ResponseMessage
 from oidcmsg.oauth2 import TokenErrorResponse
+from oidcmsg.oauth2 import factory
+from oidcmsg.oauth2 import is_error_message
 
 __author__ = 'Roland Hedberg'
 
@@ -117,7 +116,8 @@ def test_urlencoded_with_redirect_uri(self):
 
         ue = ar.to_urlencoded()
         assert query_string_compare(ue,
-                                    "state=cold&redirect_uri=http%3A%2F%2Ffoobar.example.com%2Foaclient&"
+                                    "state=cold&redirect_uri=http%3A%2F%2Ffoobar.example.com"
+                                    "%2Foaclient&"
                                     "response_type=code&client_id=foobar")
 
     def test_urlencoded_resp_type_token(self):
@@ -128,7 +128,8 @@ def test_urlencoded_resp_type_token(self):
 
         ue = ar.to_urlencoded()
         assert query_string_compare(ue,
-                                    "state=xyz&redirect_uri=https%3A%2F%2Fclient.example.com%2Fcb&response_type=token&"
+                                    "state=xyz&redirect_uri=https%3A%2F%2Fclient.example.com%2Fcb"
+                                    "&response_type=token&"
                                     "client_id=s6BhdRkqt3")
 
     def test_deserialize_urlencoded(self):
@@ -146,7 +147,8 @@ def test_urlencoded_with_scope(self):
 
         ue = ar.to_urlencoded()
         assert query_string_compare(ue,
-                                    "scope=foo+bar&state=cold&redirect_uri=http%3A%2F%2Ffoobar.example.com%2Foaclient&"
+                                    "scope=foo+bar&state=cold&redirect_uri=http%3A%2F%2Ffoobar"
+                                    ".example.com%2Foaclient&"
                                     "response_type=code&client_id=foobar")
 
     def test_deserialize_urlencoded_multiple_params(self):
@@ -165,9 +167,11 @@ def test_urlencoded_missing_required(self):
             ar.verify()
 
     def test_urlencoded_invalid_scope(self):
-        args = {"response_type": [10], "client_id": "foobar",
-                "redirect_uri": "http://foobar.example.com/oaclient",
-                "scope": ["foo", "bar"], "state": "cold"}
+        args = {
+            "response_type": [10], "client_id": "foobar",
+            "redirect_uri": "http://foobar.example.com/oaclient",
+            "scope": ["foo", "bar"], "state": "cold"
+        }
 
         with pytest.raises(DecodeError):
             AuthorizationRequest(**args)
@@ -245,11 +249,13 @@ def test_verify(self):
         assert ar.verify()
 
     def test_load_dict(self):
-        bib = {"scope": ["openid"],
-               "state": "id-6da9ca0cc23959f5f33e8becd9b08cae",
-               "redirect_uri": "http://localhost:8087authz",
-               "response_type": ["code"],
-               "client_id": "a1b2c3"}
+        bib = {
+            "scope": ["openid"],
+            "state": "id-6da9ca0cc23959f5f33e8becd9b08cae",
+            "redirect_uri": "http://localhost:8087authz",
+            "response_type": ["code"],
+            "client_id": "a1b2c3"
+        }
 
         arq = AuthorizationRequest(**bib)
 
@@ -260,11 +266,13 @@ def test_load_dict(self):
         assert arq["client_id"] == bib["client_id"]
 
     def test_json_serizalize_deserialize_multiple_params(self):
-        argv = {"scope": ["openid"],
-                "state": "id-b0be8bb64118c3ec5f70093a1174b039",
-                "redirect_uri": "http://localhost:8087authz",
-                "response_type": ["code"],
-                "client_id": "a1b2c3"}
+        argv = {
+            "scope": ["openid"],
+            "state": "id-b0be8bb64118c3ec5f70093a1174b039",
+            "redirect_uri": "http://localhost:8087authz",
+            "response_type": ["code"],
+            "client_id": "a1b2c3"
+        }
 
         arq = AuthorizationRequest(**argv)
         jstr = arq.serialize(method="json")
@@ -416,15 +424,18 @@ def test_to_urlencoded_extended_omit(self):
 
         uec = atr.to_urlencoded()
         assert query_string_compare(uec,
-                                    "scope=inner+outer&level=3&expires_in=3600&token_type=example&extra=local&"
+                                    "scope=inner+outer&level=3&expires_in=3600&token_type=example"
+                                    "&extra=local&"
                                     "extra=external&refresh_token=tGzv3JOkF0XG5Qx2TlKWIA&"
-                                    "access_token=2YotnFZFEjr1zCsicMWpAA&example_parameter=example_value")
+                                    "access_token=2YotnFZFEjr1zCsicMWpAA&example_parameter"
+                                    "=example_value")
 
         del atr["extra"]
         ouec = atr.to_urlencoded()
         assert query_string_compare(ouec,
                                     "access_token=2YotnFZFEjr1zCsicMWpAA&refresh_token=tGzv3JOkF0XG5Qx2TlKWIA&"
-                                    "level=3&example_parameter=example_value&token_type=example&expires_in=3600&"
+                                    "level=3&example_parameter=example_value&token_type=example"
+                                    "&expires_in=3600&"
                                     "scope=inner+outer")
         assert len(uec) == (len(ouec) + len("extra=local") +
                             len("extra=external") + 2)

tests/test_7_session.py

@@ -41,21 +41,22 @@
     {"type": "EC", "crv": "P-256", "use": ["enc"]}
     ]
 
-_dirname = os.path.dirname(os.path.abspath(__file__))
 
-CLI_KEY = init_key_jar(public_path='{}/pub_client.jwks'.format(_dirname),
-                       private_path='{}/priv_client.jwks'.format(_dirname),
+def full_path(local_file):
+    _dirname = os.path.dirname(os.path.abspath(__file__))
+    return os.path.join(_dirname, local_file)
+
+
+CLI_KEY = init_key_jar(public_path=full_path('pub_client.jwks'),
+                       private_path=full_path('priv_client.jwks'),
                        key_defs=KEYDEF, owner=CLIENT_ID)
 
-ISS_KEY = init_key_jar(public_path='{}/pub_iss.jwks'.format(_dirname),
-                       private_path='{}/priv_iss.jwks'.format(_dirname),
+ISS_KEY = init_key_jar(public_path=full_path('pub_iss.jwks'),
+                       private_path=full_path('priv_iss.jwks'),
                        key_defs=KEYDEF, owner=ISS)
 
-ISS_KEY.import_jwks_as_json(open('{}/pub_client.jwks'.format(_dirname)).read(),
-                            CLIENT_ID)
-
-CLI_KEY.import_jwks_as_json(open('{}/pub_iss.jwks'.format(_dirname)).read(),
-                            ISS)
+ISS_KEY.import_jwks_as_json(open(full_path('pub_client.jwks')).read(), CLIENT_ID)
+CLI_KEY.import_jwks_as_json(open(full_path('pub_iss.jwks')).read(),ISS)
 
 
 class TestEndSessionResponse(object):