isort max line length = 100

Author: rohe

.isort.cfg

@@ -3,4 +3,5 @@ force_single_line = 1
 known_first_party = oidcmsg
 known_third_party = cryptojwt,pytest
 known_future_library = future,past
-default_section = THIRDPARTY
+default_section = THIRDPARTY
+line_length = 100

src/oidcmsg/oauth2/__init__.py

@@ -6,7 +6,6 @@
 from oidcmsg import verified_claim_name
 from oidcmsg.exception import MissingAttribute
 from oidcmsg.exception import VerificationError
-from oidcmsg.message import Message
 from oidcmsg.message import OPTIONAL_LIST_OF_SP_SEP_STRINGS
 from oidcmsg.message import OPTIONAL_LIST_OF_STRINGS
 from oidcmsg.message import REQUIRED_LIST_OF_SP_SEP_STRINGS
@@ -17,6 +16,7 @@
 from oidcmsg.message import SINGLE_REQUIRED_BOOLEAN
 from oidcmsg.message import SINGLE_REQUIRED_INT
 from oidcmsg.message import SINGLE_REQUIRED_STRING
+from oidcmsg.message import Message
 
 logger = logging.getLogger(__name__)
 

src/oidcmsg/oauth2/device_authorization.py

@@ -1,10 +1,10 @@
 from oidcmsg import oidc
 from oidcmsg.exception import MissingRequiredAttribute
-from oidcmsg.message import Message
 from oidcmsg.message import SINGLE_OPTIONAL_INT
 from oidcmsg.message import SINGLE_OPTIONAL_STRING
 from oidcmsg.message import SINGLE_REQUIRED_INT
 from oidcmsg.message import SINGLE_REQUIRED_STRING
+from oidcmsg.message import Message
 
 
 class AuthorizationRequest(Message):

src/oidcmsg/oidc/__init__.py

@@ -27,7 +27,6 @@
 from oidcmsg.exception import OidcMsgError
 from oidcmsg.exception import SchemeError
 from oidcmsg.exception import VerificationError
-from oidcmsg.message import Message
 from oidcmsg.message import OPTIONAL_LIST_OF_SP_SEP_STRINGS
 from oidcmsg.message import OPTIONAL_LIST_OF_STRINGS
 from oidcmsg.message import OPTIONAL_MESSAGE
@@ -37,6 +36,7 @@
 from oidcmsg.message import SINGLE_OPTIONAL_JSON
 from oidcmsg.message import SINGLE_OPTIONAL_STRING
 from oidcmsg.message import SINGLE_REQUIRED_STRING
+from oidcmsg.message import Message
 from oidcmsg.message import msg_ser
 from oidcmsg.oauth2 import ResponseMessage
 from oidcmsg.time_util import utc_time_sans_frac

src/oidcmsg/oidc/identity_assurance.py

@@ -2,11 +2,13 @@
 import datetime
 import json
 
-from oidcmsg.message import Message
+from oidcendpoint.util import importer
+
 from oidcmsg.message import OPTIONAL_MESSAGE
 from oidcmsg.message import SINGLE_OPTIONAL_JSON
 from oidcmsg.message import SINGLE_OPTIONAL_STRING
 from oidcmsg.message import SINGLE_REQUIRED_STRING
+from oidcmsg.message import Message
 from oidcmsg.message import msg_deser
 from oidcmsg.message import msg_list_ser
 from oidcmsg.message import msg_ser
@@ -18,8 +20,6 @@
 from oidcmsg.oidc import deserialize_from_one_of
 from oidcmsg.oidc import msg_ser_json
 
-from oidcendpoint.util import importer
-
 
 class PlaceOfBirth(Message):
     c_param = {

src/oidcmsg/oidc/session.py

@@ -3,19 +3,20 @@
 from cryptojwt.exception import UnsupportedAlgorithm
 
 from oidcmsg.time_util import utc_time_sans_frac
+
 from ..exception import MessageException
 from ..exception import NotForMe
-from ..message import Message
 from ..message import REQUIRED_LIST_OF_STRINGS
 from ..message import SINGLE_OPTIONAL_STRING
 from ..message import SINGLE_REQUIRED_INT
 from ..message import SINGLE_REQUIRED_JSON
 from ..message import SINGLE_REQUIRED_STRING
+from ..message import Message
 from ..oauth2 import ResponseMessage
 from ..oidc import ID_TOKEN_VERIFY_ARGS
+from ..oidc import SINGLE_OPTIONAL_IDTOKEN
 from ..oidc import IdToken
 from ..oidc import MessageWithIdToken
-from ..oidc import SINGLE_OPTIONAL_IDTOKEN
 from ..oidc import clear_verified_claims
 from ..oidc import verified_claim_name
 from ..oidc import verify_id_token

src/oidcmsg/storage/init.py

@@ -1,7 +1,6 @@
 from .extension import LabeledDict
 from .utils import importer
 
-
 """
 Configuration examples
 

tests/test_05_oauth2.py

@@ -1,5 +1,4 @@
 # pylint: disable=no-self-use,missing-docstring
-
 import json
 from urllib.parse import parse_qs
 from urllib.parse import urlparse
@@ -18,9 +17,9 @@
 from oidcmsg.oauth2 import AuthorizationRequest
 from oidcmsg.oauth2 import AuthorizationResponse
 from oidcmsg.oauth2 import CCAccessTokenRequest
-from oidcmsg.oauth2 import ROPCAccessTokenRequest
 from oidcmsg.oauth2 import RefreshAccessTokenRequest
 from oidcmsg.oauth2 import ResponseMessage
+from oidcmsg.oauth2 import ROPCAccessTokenRequest
 from oidcmsg.oauth2 import TokenErrorResponse
 from oidcmsg.oauth2 import factory
 from oidcmsg.oauth2 import is_error_message

tests/test_06_oidc.py

@@ -21,8 +21,9 @@
 from oidcmsg.exception import MissingRequiredAttribute
 from oidcmsg.exception import NotAllowedValue
 from oidcmsg.exception import OidcMsgError
-from oidcmsg.oauth2 import ROPCAccessTokenRequest
 from oidcmsg.oauth2 import ResponseMessage
+from oidcmsg.oauth2 import ROPCAccessTokenRequest
+from oidcmsg.oidc import JRD
 from oidcmsg.oidc import AccessTokenRequest
 from oidcmsg.oidc import AccessTokenResponse
 from oidcmsg.oidc import AddressClaim
@@ -35,7 +36,6 @@
 from oidcmsg.oidc import Claims
 from oidcmsg.oidc import DiscoveryRequest
 from oidcmsg.oidc import IdToken
-from oidcmsg.oidc import JRD
 from oidcmsg.oidc import Link
 from oidcmsg.oidc import OpenIDSchema
 from oidcmsg.oidc import ProviderConfigurationResponse
@@ -475,11 +475,9 @@ def test_required_parameters(self, required_param):
             "authorization_endpoint":
                 "https://server.example.com/connect/authorize",
             "jwks_uri": "https://server.example.com/jwks.json",
-            "response_types_supported": ["code", "code id_token", "id_token",
-                                         "token id_token"],
+            "response_types_supported": ["code", "code id_token", "id_token", "token id_token"],
             "subject_types_supported": ["public", "pairwise"],
-            "id_token_signing_alg_values_supported": ["RS256", "ES256",
-                                                      "HS256"],
+            "id_token_signing_alg_values_supported": ["RS256", "ES256", "HS256"],
         }
 
         del provider_config[required_param]
@@ -494,8 +492,7 @@ def test_token_endpoint_is_not_required_for_implicit_flow_only(self):
             "jwks_uri": "https://server.example.com/jwks.json",
             "response_types_supported": ["id_token", "token id_token"],
             "subject_types_supported": ["public", "pairwise"],
-            "id_token_signing_alg_values_supported": ["RS256", "ES256",
-                                                      "HS256"],
+            "id_token_signing_alg_values_supported": ["RS256", "ES256", "HS256"],
         }
 
         # should not raise an exception
@@ -547,8 +544,7 @@ def test_registration_request(self):
         req = RegistrationRequest(operation="register", default_max_age=10,
                                   require_auth_time=True, default_acr="foo",
                                   application_type="web",
-                                  redirect_uris=[
-                                      "https://example.com/authz_cb"])
+                                  redirect_uris=["https://example.com/authz_cb"])
         assert req.verify()
         js = req.to_json()
         js_obj = json.loads(js)
@@ -570,11 +566,9 @@ def test_registration_request(self):
         "id_token_encrypted_response_enc",
         "userinfo_encrypted_response_enc",
     ])
-    def test_registration_request_with_coupled_encryption_params(self,
-                                                                 enc_param):
+    def test_registration_request_with_coupled_encryption_params(self, enc_param):
         registration_params = {
-            "redirect_uris": ["https://example.com/authz_cb"],
-            enc_param: "RS25asdasd6"
+            "redirect_uris": ["https://example.com/authz_cb"], enc_param: "RS256"
         }
         registration_req = RegistrationRequest(**registration_params)
         with pytest.raises(MissingRequiredAttribute):
@@ -745,8 +739,8 @@ def test_request(self):
         ar = AuthorizationRequest(**args)
         keyjar = KeyJar()
         keyjar.add_symmetric('', "SomeTestPassword")
-        _signed_jwt = make_openid_request(ar, keyjar, 'foobar', 'HS256',
-                                          'barfoo')
+        keyjar.add_symmetric('foobar', "SomeTestPassword")
+        _signed_jwt = make_openid_request(ar, keyjar, 'foobar', 'HS256', 'barfoo')
         ar['request'] = _signed_jwt
         del ar['nonce']
         del ar['extra']

tests/test_07_session.py

@@ -3,23 +3,23 @@
 
 import pytest
 from cryptojwt.jws.jws import JWS
+from cryptojwt.jws.utils import alg2keytype
 from cryptojwt.key_bundle import KeyBundle
-from cryptojwt.key_jar import init_key_jar
 from cryptojwt.key_jar import KeyJar
-from cryptojwt.jws.utils import alg2keytype
+from cryptojwt.key_jar import init_key_jar
 
 from oidcmsg.exception import MessageException
 from oidcmsg.exception import NotForMe
-from oidcmsg.oidc import verified_claim_name
 from oidcmsg.oidc import Claims
 from oidcmsg.oidc import ClaimsRequest
 from oidcmsg.oidc import IdToken
-from oidcmsg.oidc.session import BACK_CHANNEL_LOGOUT_EVENT, \
-    BackChannelLogoutRequest
-from oidcmsg.oidc.session import LogoutToken
+from oidcmsg.oidc import verified_claim_name
+from oidcmsg.oidc.session import BACK_CHANNEL_LOGOUT_EVENT
+from oidcmsg.oidc.session import BackChannelLogoutRequest
 from oidcmsg.oidc.session import CheckSessionRequest
 from oidcmsg.oidc.session import EndSessionRequest
 from oidcmsg.oidc.session import EndSessionResponse
+from oidcmsg.oidc.session import LogoutToken
 from oidcmsg.time_util import utc_time_sans_frac
 
 CLIENT_ID = "client_1"

tests/test_10_identity_assurance.py

@@ -2,15 +2,14 @@
 from urllib.parse import quote_plus
 
 from oidcmsg.oidc import Claims
-from oidcmsg.time_util import time_sans_frac
-
 from oidcmsg.oidc.identity_assurance import ClaimsConstructor
 from oidcmsg.oidc.identity_assurance import IDAClaimsRequest
 from oidcmsg.oidc.identity_assurance import VerificationElement
 from oidcmsg.oidc.identity_assurance import VerifiedClaims
 from oidcmsg.oidc.identity_assurance import VerifiedClaimsRequest
 from oidcmsg.oidc.identity_assurance import from_iso8601_2004_time
 from oidcmsg.oidc.identity_assurance import to_iso8601_2004_time
+from oidcmsg.time_util import time_sans_frac
 
 
 def test_time_stamp():