Remove support for Python 3.7 as Debian 10 is EOL.

This commit is contained in:
Aditya Toshniwal
2024-07-01 12:39:12 +05:30
committed by GitHub
parent 91eb60a363
commit 3bb9f0ba8c
8 changed files with 25 additions and 62 deletions

View File

@@ -520,13 +520,9 @@ def create_app(app_name=None):
security.init_app(app, user_datastore)
# register custom unauthorised handler.
if sys.version_info < (3, 8):
app.login_manager.unauthorized_handler(pga_unauthorised)
else:
# Flask-Security-Too > 5.4.* requires custom unauth handeler
# to be registeres with it.
security.unauthn_handler(pga_unauthorised)
# Flask-Security-Too > 5.4.* requires custom unauth handeler
# to be registeres with it.
security.unauthn_handler(pga_unauthorised)
# Set the permanent session lifetime to the specified value in config file.
app.permanent_session_lifetime = timedelta(

View File

@@ -65,13 +65,7 @@ from pgadmin.authenticate import AuthSourceManager
from pgadmin.utils.exception import CryptKeyMissing
from pgadmin.user_login_check import pga_login_required
try:
from flask_security.views import default_render_json
except ImportError as e:
# Support Flask-Security-Too == 3.2
if sys.version_info < (3, 8):
from flask_security.views import _render_json as default_render_json
from flask_security.views import default_render_json
MODULE_NAME = 'browser'
BROWSER_STATIC = 'browser.static'
@@ -1103,8 +1097,7 @@ if hasattr(config, 'SECURITY_RECOVERABLE') and config.SECURITY_RECOVERABLE:
form_class = _security.forms.get('reset_password_form').cls
form = form_class(request.form) if request.form else form_class()
if sys.version_info >= (3, 8):
form.user = user
form.user = user
if form.validate_on_submit():
try:

View File

@@ -12,8 +12,7 @@
import json
import sys
if sys.version_info >= (3, 8):
from unicodedata import normalize, is_normalized
from unicodedata import normalize, is_normalized
from flask import render_template, request, \
Response, abort, current_app, session
@@ -446,10 +445,6 @@ def normalise_password(password):
'NFKD'
)
# Remove check of Python version once Python 3.7 support ends
if sys.version_info < (3, 8):
return password
return password if is_normalized(normalise_form, password) else\
normalize(normalise_form, password)