Merge pull request #404 from mrhaleemkhan/master

Fixing issue related Flask 3 and oauthlib new version

Author: lepture

flask_oauthlib/utils.py

@@ -2,7 +2,7 @@
 
 import base64
 from flask import request, Response
-from oauthlib.common import to_unicode, bytes_type
+from oauthlib.common import to_unicode
 
 
 def _get_uri_from_request(request):
@@ -31,7 +31,7 @@ def extract_params():
     # parsing, so we just replace the Authorization header with the extraced
     # info if it was successfully parsed.
     if request.authorization:
-        headers['Authorization'] = request.authorization
+        headers['Authorization'] = str(request.authorization)
 
     body = request.form.to_dict()
     return uri, http_method, body, headers
@@ -41,7 +41,7 @@ def to_bytes(text, encoding='utf-8'):
     """Make sure text is bytes type."""
     if not text:
         return text
-    if not isinstance(text, bytes_type):
+    if not isinstance(text, bytes):
         text = text.encode(encoding)
     return text
 

requirements.txt

@@ -1,6 +1,7 @@
-Flask>=0.12.3
+Flask==3.0.0
 mock==2.0.0
-oauthlib==2.0.6
-requests-oauthlib==0.8.0
-Flask-SQLAlchemy==2.1
-cachelib==0.1.1
+oauthlib==3.2.2
+requests-oauthlib==1.3.1
+Flask-SQLAlchemy==3.1.1
+cachelib==0.10.2
+

setup.py

@@ -43,8 +43,8 @@ def fread(filename):
     license='BSD',
     install_requires=[
         'Flask',
-        'oauthlib>=1.1.2,!=2.0.3,!=2.0.4,!=2.0.5,<3.0.0',
-        'requests-oauthlib>=0.6.2,<1.2.0',
+        'oauthlib>=3.0.0,<3.2.2',
+        'requests-oauthlib>=1.0,<1.3.1',
         'cachelib',
     ],
     tests_require=['nose', 'Flask-SQLAlchemy', 'mock'],