Update imports in Flask OAuth2 integration

lepture · Jan 2, 2019 · 5564d2d · 5564d2d
1 parent 8b535a8
commit 5564d2d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/authlib/flask/oauth2/authorization_server.py b/authlib/flask/oauth2/authorization_server.py
@@ -1,10 +1,10 @@
 from werkzeug.utils import import_string
 from flask import Response, json
-from authlib.specs.rfc6749 import (
+from authlib.oauth2 import (
     OAuth2Request,
+    ClientAuthentication,
     AuthorizationServer as _AuthorizationServer,
 )
-from authlib.specs.rfc6749 import ClientAuthentication
 from authlib.specs.rfc6750 import BearerToken
 from authlib.common.security import generate_token
 from authlib.common.encoding import to_unicode

diff --git a/authlib/flask/oauth2/cache.py b/authlib/flask/oauth2/cache.py
@@ -1,5 +1,5 @@
 from authlib.common.security import generate_token
-from authlib.specs.rfc6749.grants import AuthorizationCodeGrant
+from authlib.oauth2.rfc6749.grants import AuthorizationCodeGrant
 
 
 class AuthorizationCode(dict):

diff --git a/authlib/oauth2/__init__.py b/authlib/oauth2/__init__.py
@@ -1,3 +1,13 @@
 from .base import OAuth2Error
+from .rfc6749 import (
+    OAuth2Request,
+    AuthorizationServer,
+    ClientAuthentication,
+    ResourceProtector,
+)
 
-__all__ = ['OAuth2Error']
+__all__ = [
+    'OAuth2Error',
+    'OAuth2Request', 'AuthorizationServer',
+    'ClientAuthentication', 'ResourceProtector',
+]