isort fixing

peppelinux · peppelinux · commit d6496bd5151d · 2020-07-27T13:55:21.000+02:00
diff --git a/src/oidcservice/client_auth.py b/src/oidcservice/client_auth.py
@@ -6,15 +6,11 @@
 from cryptojwt.exception import MissingKey
 from cryptojwt.jws.utils import alg2keytype
 from oidcmsg.message import VREQUIRED
-from oidcmsg.oauth2 import AccessTokenRequest
-from oidcmsg.oauth2 import SINGLE_OPTIONAL_STRING
+from oidcmsg.oauth2 import SINGLE_OPTIONAL_STRING, AccessTokenRequest
 from oidcmsg.oidc import AuthnToken
 from oidcmsg.time_util import utc_time_sans_frac
 
-from oidcservice import DEF_SIGN_ALG
-from oidcservice import JWT_BEARER
-from oidcservice import rndstr
-from oidcservice import sanitize
+from oidcservice import DEF_SIGN_ALG, JWT_BEARER, rndstr, sanitize
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/src/oidcservice/oauth2/authorization.py b/src/oidcservice/oauth2/authorization.py
@@ -6,12 +6,10 @@
 from oidcmsg.oauth2 import ResponseMessage
 from oidcmsg.time_util import time_sans_frac
 
-from oidcservice.oauth2.utils import get_state_parameter
-from oidcservice.oauth2.utils import pick_redirect_uris
-from oidcservice.oauth2.utils import set_state_parameter
+from oidcservice.oauth2.utils import (get_state_parameter, pick_redirect_uris,
+                                      set_state_parameter)
 from oidcservice.service import Service
 
-
 LOGGER = logging.getLogger(__name__)
 
 
diff --git a/src/oidcservice/oauth2/provider_info_discovery.py b/src/oidcservice/oauth2/provider_info_discovery.py
@@ -2,7 +2,6 @@
 import logging
 
 from cryptojwt.key_jar import KeyJar
-
 from oidcmsg import oauth2
 from oidcmsg.oauth2 import ResponseMessage
 
diff --git a/src/oidcservice/oauth2/refresh_access_token.py b/src/oidcservice/oauth2/refresh_access_token.py
@@ -8,7 +8,6 @@
 from oidcservice.oauth2.utils import get_state_parameter
 from oidcservice.service import Service
 
-
 LOGGER = logging.getLogger(__name__)
 
 
diff --git a/src/oidcservice/oidc/access_token.py b/src/oidcservice/oidc/access_token.py
@@ -4,8 +4,8 @@
 from oidcmsg.oidc import verified_claim_name
 from oidcmsg.time_util import time_sans_frac
 
-from oidcservice.oauth2 import access_token
 from oidcservice.exception import ParameterError
+from oidcservice.oauth2 import access_token
 from oidcservice.oidc import IDT2REG
 
 __author__ = 'Roland Hedberg'
diff --git a/src/oidcservice/oidc/add_on/pkce.py b/src/oidcservice/oidc/add_on/pkce.py
@@ -3,8 +3,7 @@
 from cryptojwt.utils import b64e
 from oidcmsg.message import Message
 
-from oidcservice import CC_METHOD
-from oidcservice import unreserved
+from oidcservice import CC_METHOD, unreserved
 from oidcservice.exception import Unsupported
 from oidcservice.oauth2.utils import get_state_parameter
 
diff --git a/src/oidcservice/oidc/add_on/pushed_authorization.py b/src/oidcservice/oidc/add_on/pushed_authorization.py
@@ -1,10 +1,11 @@
 import logging
 
-import requests
 from cryptojwt import JWT
 from oidcmsg.message import Message
 from oidcmsg.oauth2 import JWTSecuredAuthorizationRequest
 
+import requests
+
 logger = logging.getLogger(__name__)
 
 
diff --git a/src/oidcservice/oidc/authorization.py b/src/oidcservice/oidc/authorization.py
@@ -1,17 +1,16 @@
 import logging
 
 from oidcmsg import oidc
-from oidcmsg.oidc import make_openid_request
-from oidcmsg.oidc import verified_claim_name
+from oidcmsg.oidc import make_openid_request, verified_claim_name
 from oidcmsg.time_util import time_sans_frac
 
 from oidcservice import rndstr
 from oidcservice.exception import ParameterError
 from oidcservice.oauth2 import authorization
-from oidcservice.oidc import IDT2REG
 from oidcservice.oauth2.utils import pick_redirect_uris
-from oidcservice.oidc.utils import construct_request_uri
-from oidcservice.oidc.utils import request_object_encryption
+from oidcservice.oidc import IDT2REG
+from oidcservice.oidc.utils import (construct_request_uri,
+                                    request_object_encryption)
 
 __author__ = 'Roland Hedberg'
 
diff --git a/src/oidcservice/oidc/check_id.py b/src/oidcservice/oidc/check_id.py
@@ -1,7 +1,6 @@
 import logging
 
-from oidcmsg.oauth2 import Message
-from oidcmsg.oauth2 import ResponseMessage
+from oidcmsg.oauth2 import Message, ResponseMessage
 from oidcmsg.oidc import session
 
 from oidcservice.service import Service
diff --git a/src/oidcservice/oidc/check_session.py b/src/oidcservice/oidc/check_session.py
@@ -1,7 +1,6 @@
 import logging
 
-from oidcmsg.oauth2 import Message
-from oidcmsg.oauth2 import ResponseMessage
+from oidcmsg.oauth2 import Message, ResponseMessage
 from oidcmsg.oidc import session
 
 from oidcservice.service import Service
diff --git a/src/oidcservice/oidc/end_session.py b/src/oidcservice/oidc/end_session.py
@@ -1,7 +1,6 @@
 import logging
 
-from oidcmsg.oauth2 import Message
-from oidcmsg.oauth2 import ResponseMessage
+from oidcmsg.oauth2 import Message, ResponseMessage
 from oidcmsg.oidc import session
 
 from oidcservice import rndstr
diff --git a/src/oidcservice/oidc/provider_info_discovery.py b/src/oidcservice/oidc/provider_info_discovery.py
@@ -3,8 +3,8 @@
 from oidcmsg import oidc
 from oidcmsg.oauth2 import ResponseMessage
 
-from oidcservice.oauth2 import provider_info_discovery
 from oidcservice.exception import ConfigurationError
+from oidcservice.oauth2 import provider_info_discovery
 
 __author__ = 'Roland Hedberg'
 
diff --git a/src/oidcservice/oidc/read_registration.py b/src/oidcservice/oidc/read_registration.py
@@ -6,7 +6,6 @@
 
 from oidcservice.service import Service
 
-
 LOGGER = logging.getLogger(__name__)
 
 
diff --git a/src/oidcservice/oidc/userinfo.py b/src/oidcservice/oidc/userinfo.py
@@ -7,7 +7,6 @@
 from oidcservice.oauth2.utils import get_state_parameter
 from oidcservice.service import Service
 
-
 logger = logging.getLogger(__name__)
 
 UI2REG = {
diff --git a/src/oidcservice/oidc/webfinger.py b/src/oidcservice/oidc/webfinger.py
@@ -1,15 +1,12 @@
 import logging
-from urllib.parse import urlsplit
-from urllib.parse import urlunsplit
+from urllib.parse import urlsplit, urlunsplit
 
 from oidcmsg import oidc
 from oidcmsg.exception import MissingRequiredAttribute
-from oidcmsg.oauth2 import Message
-from oidcmsg.oauth2 import ResponseMessage
+from oidcmsg.oauth2 import Message, ResponseMessage
 from oidcmsg.oidc import JRD
 
-from oidcservice.oidc import OIC_ISSUER
-from oidcservice.oidc import WF_URL
+from oidcservice.oidc import OIC_ISSUER, WF_URL
 from oidcservice.service import Service
 
 __author__ = 'Roland Hedberg'
diff --git a/src/oidcservice/service.py b/src/oidcservice/service.py
@@ -4,18 +4,14 @@
 
 from cryptojwt.jwt import JWT
 from oidcmsg.message import Message
-from oidcmsg.oauth2 import ResponseMessage
-from oidcmsg.oauth2 import is_error_message
+from oidcmsg.oauth2 import ResponseMessage, is_error_message
 
 from oidcservice import util
 from oidcservice.client_auth import factory as ca_factory
 from oidcservice.exception import ResponseError
 from oidcservice.state_interface import StateInterface
-from oidcservice.util import JOSE_ENCODED
-from oidcservice.util import JSON_ENCODED
-from oidcservice.util import URL_ENCODED
-from oidcservice.util import get_http_body
-from oidcservice.util import get_http_url
+from oidcservice.util import (JOSE_ENCODED, JSON_ENCODED, URL_ENCODED,
+                              get_http_body, get_http_url)
 
 __author__ = 'Roland Hedberg'
 
diff --git a/src/oidcservice/service_context.py b/src/oidcservice/service_context.py
@@ -6,17 +6,15 @@
 import hashlib
 import os
 
-from cryptojwt.jwk.rsa import RSAKey
-from cryptojwt.jwk.rsa import import_private_rsa_key_from_file
+from cryptojwt.jwk.rsa import RSAKey, import_private_rsa_key_from_file
 from cryptojwt.key_bundle import KeyBundle
 from cryptojwt.key_jar import build_keyjar
 from cryptojwt.utils import as_bytes
+from oidcmsg.context import OidcContext
 # This represents a map between the local storage of algorithm choices
 # and how they are represented in a provider info response.
 from oidcmsg.message import Message
 from oidcmsg.oidc import RegistrationRequest
-from oidcmsg.context import OidcContext
-
 
 CLI_REG_MAP = {
     "userinfo": {
diff --git a/src/oidcservice/state_interface.py b/src/oidcservice/state_interface.py
@@ -1,9 +1,8 @@
 """A database interface for storing state information."""
 import json
 
-from oidcmsg.message import Message
-from oidcmsg.message import SINGLE_OPTIONAL_JSON
-from oidcmsg.message import SINGLE_REQUIRED_STRING
+from oidcmsg.message import (SINGLE_OPTIONAL_JSON, SINGLE_REQUIRED_STRING,
+                             Message)
 from oidcmsg.oidc import verified_claim_name
 
 from oidcservice import rndstr
diff --git a/src/oidcservice/util.py b/src/oidcservice/util.py
@@ -1,9 +1,7 @@
 """Utilities"""
 import importlib
 import logging
-from urllib.parse import parse_qs
-from urllib.parse import urlsplit
-from urllib.parse import urlunsplit
+from urllib.parse import parse_qs, urlsplit, urlunsplit
 
 import yaml
 from oidcmsg.exception import UnSupported
diff --git a/tests/test_03_util.py b/tests/test_03_util.py
@@ -1,13 +1,10 @@
 import json
-from urllib.parse import parse_qs
-from urllib.parse import urlsplit
+from urllib.parse import parse_qs, urlsplit
 
-from oidcmsg.oauth2 import AccessTokenRequest
-from oidcmsg.oauth2 import AuthorizationRequest
+from oidcmsg.oauth2 import AccessTokenRequest, AuthorizationRequest
 
 from oidcservice import util
-from oidcservice.util import JSON_ENCODED
-from oidcservice.util import URL_ENCODED
+from oidcservice.util import JSON_ENCODED, URL_ENCODED
 
 __author__ = 'Roland Hedberg'
 
diff --git a/tests/test_07_service.py b/tests/test_07_service.py
@@ -1,14 +1,10 @@
 import pytest
+from oidcmsg.oauth2 import (SINGLE_OPTIONAL_INT, SINGLE_OPTIONAL_STRING,
+                            SINGLE_REQUIRED_STRING, Message)
 
-from oidcservice.service_context import ServiceContext
 from oidcservice.service import Service
-from oidcservice.state_interface import InMemoryStateDataBase
-from oidcservice.state_interface import State
-
-from oidcmsg.oauth2 import Message
-from oidcmsg.oauth2 import SINGLE_OPTIONAL_INT
-from oidcmsg.oauth2 import SINGLE_OPTIONAL_STRING
-from oidcmsg.oauth2 import SINGLE_REQUIRED_STRING
+from oidcservice.service_context import ServiceContext
+from oidcservice.state_interface import InMemoryStateDataBase, State
 
 
 class DummyMessage(Message):
diff --git a/tests/test_08_webfinger.py b/tests/test_08_webfinger.py
@@ -1,12 +1,9 @@
 import json
-from urllib.parse import parse_qs
-from urllib.parse import unquote_plus
-from urllib.parse import urlsplit
+from urllib.parse import parse_qs, unquote_plus, urlsplit
 
 import pytest
 from oidcmsg.exception import MissingRequiredAttribute
-from oidcmsg.oidc import JRD
-from oidcmsg.oidc import Link
+from oidcmsg.oidc import JRD, Link
 
 from oidcservice.oidc import OIC_ISSUER
 from oidcservice.oidc.webfinger import WebFinger
diff --git a/tests/test_09_client_auth.py b/tests/test_09_client_auth.py
@@ -3,35 +3,25 @@
 from urllib.parse import quote_plus
 
 import pytest
-
-from cryptojwt.key_bundle import KeyBundle
-from cryptojwt.key_jar import KeyJar
 from cryptojwt.jws.jws import JWS
 from cryptojwt.jwt import JWT
+from cryptojwt.key_bundle import KeyBundle
+from cryptojwt.key_jar import KeyJar
 from oidcmsg.message import Message
+from oidcmsg.oauth2 import (AccessTokenRequest, AccessTokenResponse,
+                            AuthorizationRequest, AuthorizationResponse,
+                            CCAccessTokenRequest, ResourceRequest)
 
 from oidcservice import JWT_BEARER
-from oidcservice.client_auth import assertion_jwt
-from oidcservice.client_auth import BearerBody
-from oidcservice.client_auth import BearerHeader
-from oidcservice.client_auth import ClientSecretBasic
-from oidcservice.client_auth import ClientSecretJWT
-from oidcservice.client_auth import ClientSecretPost
-from oidcservice.client_auth import PrivateKeyJWT
-from oidcservice.client_auth import valid_service_context
+from oidcservice.client_auth import (BearerBody, BearerHeader,
+                                     ClientSecretBasic, ClientSecretJWT,
+                                     ClientSecretPost, PrivateKeyJWT,
+                                     assertion_jwt, valid_service_context)
 from oidcservice.oidc import DEFAULT_SERVICES
-from oidcservice.service_factory import service_factory
 from oidcservice.service import init_services
 from oidcservice.service_context import ServiceContext
-from oidcservice.state_interface import InMemoryStateDataBase
-from oidcservice.state_interface import State
-
-from oidcmsg.oauth2 import AccessTokenRequest
-from oidcmsg.oauth2 import AccessTokenResponse
-from oidcmsg.oauth2 import AuthorizationRequest
-from oidcmsg.oauth2 import AuthorizationResponse
-from oidcmsg.oauth2 import CCAccessTokenRequest
-from oidcmsg.oauth2 import ResourceRequest
+from oidcservice.service_factory import service_factory
+from oidcservice.state_interface import InMemoryStateDataBase, State
 
 BASE_PATH = os.path.abspath(os.path.dirname(__file__))
 CLIENT_ID = "A"
diff --git a/tests/test_10_oauth2_service.py b/tests/test_10_oauth2_service.py
@@ -1,15 +1,12 @@
 import pytest
-from oidcmsg.oauth2 import AccessTokenRequest
-from oidcmsg.oauth2 import AccessTokenResponse
-from oidcmsg.oauth2 import AuthorizationRequest
-from oidcmsg.oauth2 import AuthorizationResponse
-from oidcmsg.oauth2 import Message
+from oidcmsg.oauth2 import (AccessTokenRequest, AccessTokenResponse,
+                            AuthorizationRequest, AuthorizationResponse,
+                            Message)
 
 from oidcservice.service import Service
 from oidcservice.service_context import ServiceContext
 from oidcservice.service_factory import service_factory
-from oidcservice.state_interface import InMemoryStateDataBase
-from oidcservice.state_interface import State
+from oidcservice.state_interface import InMemoryStateDataBase, State
 
 
 class Response(object):
diff --git a/tests/test_13_oic_service.py b/tests/test_13_oic_service.py
@@ -6,24 +6,18 @@
 from cryptojwt.jws import jws
 from cryptojwt.jws.utils import left_hash
 from cryptojwt.jwt import JWT
-from cryptojwt.key_jar import build_keyjar
-from cryptojwt.key_jar import init_key_jar
-from oidcmsg.oauth2 import AccessTokenRequest
-from oidcmsg.oauth2 import AccessTokenResponse
-from oidcmsg.oauth2 import AuthorizationRequest
-from oidcmsg.oauth2 import AuthorizationResponse
-from oidcmsg.oauth2 import Message
-from oidcmsg.oidc import IdToken
-from oidcmsg.oidc import OpenIDSchema
-from oidcmsg.oidc import RegistrationRequest
-from oidcmsg.oidc import verified_claim_name
-from oidcmsg.oidc.session import CheckIDRequest
-from oidcmsg.oidc.session import CheckSessionRequest
-from oidcmsg.oidc.session import EndSessionRequest
+from cryptojwt.key_jar import build_keyjar, init_key_jar
+from oidcmsg.oauth2 import (AccessTokenRequest, AccessTokenResponse,
+                            AuthorizationRequest, AuthorizationResponse,
+                            Message)
+from oidcmsg.oidc import (IdToken, OpenIDSchema, RegistrationRequest,
+                          verified_claim_name)
+from oidcmsg.oidc.session import (CheckIDRequest, CheckSessionRequest,
+                                  EndSessionRequest)
 
 from oidcservice.exception import ParameterError
-from oidcservice.oidc.registration import add_jwks_uri_or_jwks
-from oidcservice.oidc.registration import response_types_to_grant_types
+from oidcservice.oidc.registration import (add_jwks_uri_or_jwks,
+                                           response_types_to_grant_types)
 from oidcservice.service_context import ServiceContext
 from oidcservice.service_factory import service_factory
 
diff --git a/tests/test_14_pkce.py b/tests/test_14_pkce.py
diff --git a/tests/test_15_oic_utils.py b/tests/test_15_oic_utils.py
diff --git a/tests/test_16_cc_oauth2_service.py b/tests/test_16_cc_oauth2_service.py
diff --git a/tests/test_17_read_registration.py b/tests/test_17_read_registration.py
diff --git a/tests/test_20_conversation.py b/tests/test_20_conversation.py
diff --git a/tests/test_30_persistence.py b/tests/test_30_persistence.py
