pre-commit: run reorder-python-imports

docs/source/conf.py

@@ -3,9 +3,7 @@
 # This file only contains a selection of the most common options. For a full
 # list see the documentation:
 # http://www.sphinx-doc.org/en/master/config
-
 # -- Path setup --------------------------------------------------------------
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

docs/source/example-oauthenticator.py

@@ -1,15 +1,17 @@
 """
 Example OAuthenticator to use with My Service
 """
-
-
 import json
 
 from jupyterhub.auth import LocalAuthenticator
-from oauthenticator.oauth2 import OAuthLoginHandler, OAuthenticator
 from tornado.auth import OAuth2Mixin
+from tornado.httpclient import AsyncHTTPClient
+from tornado.httpclient import HTTPError
+from tornado.httpclient import HTTPRequest
 from tornado.httputil import url_concat
-from tornado.httpclient import HTTPRequest, AsyncHTTPClient, HTTPError
+
+from oauthenticator.oauth2 import OAuthenticator
+from oauthenticator.oauth2 import OAuthLoginHandler
 
 
 class MyServiceMixin(OAuth2Mixin):

examples/auth_state/jupyterhub_config.py

@@ -5,13 +5,13 @@
 2. pass select auth_state to Spawner via environment variables
 3. enable auth_state via `JUPYTERHUB_CRYPT_KEY` and `enable_auth_state = True`
 """
-
 import os
 import warnings
 
-from oauthenticator.github import GitHubOAuthenticator
 from tornado import gen
 
+from oauthenticator.github import GitHubOAuthenticator
+
 # define our OAuthenticator with `.pre_spawn_start`
 # for passing auth_state into the user environment
 

examples/azuread/sample_jupyter_config.py

@@ -1,4 +1,5 @@
 import os
+
 from oauthenticator.azuread import AzureAdOAuthenticator
 
 c.JupyterHub.authenticator_class = AzureAdOAuthenticator

oauthenticator/__init__.py

@@ -1,9 +1,9 @@
 # include github, bitbucket, google here for backward-compatibility
 # don't add new oauthenticators here.
-from .oauth2 import *
-from .github import *
+from ._version import __version__
+from ._version import version_info
 from .bitbucket import *
-from .google import *
 from .cilogon import *
-
-from ._version import __version__, version_info
+from .github import *
+from .google import *
+from .oauth2 import *

oauthenticator/_version.py

@@ -1,5 +1,4 @@
 """oauthenticator version info"""
-
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 

oauthenticator/auth0.py

@@ -28,13 +28,13 @@
   c.JupyterHub.authenticator_class = 'oauthenticator.auth0.Auth0OAuthenticator'
 
 """
-
 import json
 import os
 
 from jupyterhub.auth import LocalAuthenticator
 from tornado.httpclient import HTTPRequest
-from traitlets import Unicode, default
+from traitlets import default
+from traitlets import Unicode
 
 from .oauth2 import OAuthenticator
 

oauthenticator/azuread.py

@@ -1,15 +1,15 @@
 """
 Custom Authenticator to use Azure AD with JupyterHub
 """
-
 import os
 import urllib
 from distutils.version import LooseVersion as V
 
 import jwt
 from jupyterhub.auth import LocalAuthenticator
 from tornado.httpclient import HTTPRequest
-from traitlets import Unicode, default
+from traitlets import default
+from traitlets import Unicode
 
 from .oauth2 import OAuthenticator
 

oauthenticator/bitbucket.py

@@ -1,13 +1,13 @@
 """
 Custom Authenticator to use Bitbucket OAuth with JupyterHub
 """
-
 import urllib
 
 from jupyterhub.auth import LocalAuthenticator
 from tornado.httpclient import HTTPRequest
 from tornado.httputil import url_concat
-from traitlets import Set, default
+from traitlets import default
+from traitlets import Set
 
 from .oauth2 import OAuthenticator
 

oauthenticator/cilogon.py

@@ -12,16 +12,20 @@
   Use `c.CILogonOAuthenticator.username_claim = 'email'` to use
   email instead of ePPN as the JupyterHub username.
 """
-
 import os
 
 from jupyterhub.auth import LocalAuthenticator
 from tornado import web
 from tornado.httpclient import HTTPRequest
 from tornado.httputil import url_concat
-from traitlets import Bool, List, Unicode, default, validate
-
-from .oauth2 import OAuthenticator, OAuthLoginHandler
+from traitlets import Bool
+from traitlets import default
+from traitlets import List
+from traitlets import Unicode
+from traitlets import validate
+
+from .oauth2 import OAuthenticator
+from .oauth2 import OAuthLoginHandler
 
 
 class CILogonLoginHandler(OAuthLoginHandler):

oauthenticator/generic.py

@@ -1,15 +1,20 @@
 """
 Custom Authenticator to use generic OAuth2 with JupyterHub
 """
-
 import base64
 import os
 from urllib.parse import urlencode
 
 from jupyterhub.auth import LocalAuthenticator
-from tornado.httpclient import AsyncHTTPClient, HTTPRequest
+from tornado.httpclient import AsyncHTTPClient
+from tornado.httpclient import HTTPRequest
 from tornado.httputil import url_concat
-from traitlets import Bool, Dict, List, Unicode, Union, default
+from traitlets import Bool
+from traitlets import default
+from traitlets import Dict
+from traitlets import List
+from traitlets import Unicode
+from traitlets import Union
 
 from .oauth2 import OAuthenticator
 from .traitlets import Callable

oauthenticator/github.py

@@ -1,8 +1,6 @@
 """
 Authenticator to use GitHub OAuth with JupyterHub
 """
-
-
 import json
 import os
 import warnings
@@ -11,7 +9,9 @@
 from tornado import web
 from tornado.httpclient import HTTPRequest
 from tornado.httputil import url_concat
-from traitlets import Set, Unicode, default
+from traitlets import default
+from traitlets import Set
+from traitlets import Unicode
 
 from .oauth2 import OAuthenticator
 

oauthenticator/gitlab.py

@@ -1,8 +1,6 @@
 """
 Custom Authenticator to use GitLab OAuth with JupyterHub
 """
-
-
 import json
 import os
 import warnings
@@ -12,7 +10,10 @@
 from tornado.escape import url_escape
 from tornado.httpclient import HTTPRequest
 from tornado.httputil import url_concat
-from traitlets import CUnicode, Set, Unicode, default
+from traitlets import CUnicode
+from traitlets import default
+from traitlets import Set
+from traitlets import Unicode
 
 from .oauth2 import OAuthenticator
 

oauthenticator/globus.py

@@ -11,9 +11,13 @@
 from jupyterhub.utils import url_path_join
 from tornado.httpclient import HTTPRequest
 from tornado.web import HTTPError
-from traitlets import Bool, List, Unicode, default
+from traitlets import Bool
+from traitlets import default
+from traitlets import List
+from traitlets import Unicode
 
-from .oauth2 import OAuthenticator, OAuthLogoutHandler
+from .oauth2 import OAuthenticator
+from .oauth2 import OAuthLogoutHandler
 
 
 class GlobusLogoutHandler(OAuthLogoutHandler):

oauthenticator/google.py

@@ -3,17 +3,22 @@
 
 Derived from the GitHub OAuth authenticator.
 """
-
 import os
 import urllib.parse
 
 from jupyterhub.auth import LocalAuthenticator
-from jupyterhub.crypto import EncryptionUnavailable, InvalidToken, decrypt
+from jupyterhub.crypto import decrypt
+from jupyterhub.crypto import EncryptionUnavailable
+from jupyterhub.crypto import InvalidToken
 from tornado.auth import GoogleOAuth2Mixin
 from tornado.httpclient import HTTPRequest
 from tornado.httputil import url_concat
 from tornado.web import HTTPError
-from traitlets import Dict, List, Unicode, default, validate
+from traitlets import default
+from traitlets import Dict
+from traitlets import List
+from traitlets import Unicode
+from traitlets import validate
 
 from .oauth2 import OAuthenticator
 

oauthenticator/mediawiki.py

@@ -3,19 +3,22 @@
 
 Requires `mwoauth` package.
 """
-
 import json
 import os
 from asyncio import wrap_future
 from concurrent.futures import ThreadPoolExecutor
 
 from jupyterhub.handlers import BaseHandler
 from jupyterhub.utils import url_path_join
-from mwoauth import ConsumerToken, Handshaker
+from mwoauth import ConsumerToken
+from mwoauth import Handshaker
 from mwoauth.tokens import RequestToken
-from traitlets import Any, Integer, Unicode
+from traitlets import Any
+from traitlets import Integer
+from traitlets import Unicode
 
-from oauthenticator import OAuthCallbackHandler, OAuthenticator
+from oauthenticator import OAuthCallbackHandler
+from oauthenticator import OAuthenticator
 
 # Name of cookie used to pass auth token between the oauth
 # login and authentication phase

oauthenticator/oauth2.py

@@ -3,21 +3,29 @@
 
 Most of the code c/o Kyle Kelley (@rgbkrk)
 """
-
 import base64
 import json
 import os
 import uuid
-from urllib.parse import quote, urlparse, urlunparse
+from urllib.parse import quote
+from urllib.parse import urlparse
+from urllib.parse import urlunparse
 
 from jupyterhub.auth import Authenticator
-from jupyterhub.handlers import BaseHandler, LogoutHandler
+from jupyterhub.handlers import BaseHandler
+from jupyterhub.handlers import LogoutHandler
 from jupyterhub.utils import url_path_join
 from tornado import web
 from tornado.auth import OAuth2Mixin
-from tornado.httpclient import AsyncHTTPClient, HTTPClientError
+from tornado.httpclient import AsyncHTTPClient
+from tornado.httpclient import HTTPClientError
 from tornado.log import app_log
-from traitlets import Any, Bool, Dict, List, Unicode, default
+from traitlets import Any
+from traitlets import Bool
+from traitlets import default
+from traitlets import Dict
+from traitlets import List
+from traitlets import Unicode
 
 
 def guess_callback_uri(protocol, host, hub_server_url):

oauthenticator/okpy.py

@@ -1,7 +1,6 @@
 """
 Custom Authenticator to use okpy OAuth with JupyterHub
 """
-
 from binascii import a2b_base64
 
 from jupyterhub.auth import LocalAuthenticator

oauthenticator/openshift.py

@@ -3,14 +3,16 @@
 
 Derived from the GitHub OAuth authenticator.
 """
-
 import os
 
 import requests
 from jupyterhub.auth import LocalAuthenticator
 from tornado.httpclient import HTTPRequest
 from tornado.httputil import url_concat
-from traitlets import Bool, Set, Unicode, default
+from traitlets import Bool
+from traitlets import default
+from traitlets import Set
+from traitlets import Unicode
 
 from oauthenticator.oauth2 import OAuthenticator
 

oauthenticator/tests/conftest.py

@@ -1,11 +1,10 @@
 """Py.Test fixtures"""
-
 import inspect
 
-from tornado.httpclient import AsyncHTTPClient
+from pytest import fixture
 from tornado import ioloop
+from tornado.httpclient import AsyncHTTPClient
 from tornado.platform.asyncio import AsyncIOMainLoop
-from pytest import fixture
 
 from .mocks import MockAsyncHTTPClient
 

oauthenticator/tests/mocks.py

@@ -1,20 +1,19 @@
 """Mocking utilities for testing"""
-
-from io import BytesIO
 import json
 import os
 import re
-from unittest.mock import Mock
-from urllib.parse import urlparse, parse_qs
 import uuid
+from io import BytesIO
+from unittest.mock import Mock
+from urllib.parse import parse_qs
+from urllib.parse import urlparse
 
 import pytest
-
+from tornado import web
 from tornado.httpclient import HTTPResponse
 from tornado.httputil import HTTPServerRequest
 from tornado.log import app_log
 from tornado.simple_httpclient import SimpleAsyncHTTPClient
-from tornado import web
 
 RegExpType = type(re.compile('.'))
 

oauthenticator/tests/test_auth0.py

@@ -1,7 +1,8 @@
 import os
 from unittest.mock import patch
 
-from pytest import fixture, mark
+from pytest import fixture
+from pytest import mark
 
 from ..auth0 import Auth0OAuthenticator
 from .mocks import setup_oauth_mock