From a9a1a975a60f08de3b220039de741e4048908c87 Mon Sep 17 00:00:00 2001 From: Khushboo Vashi Date: Wed, 13 May 2020 16:02:38 +0530 Subject: [PATCH] Added compatibility for Flask-Security-Too version 3.2 --- web/pgadmin/browser/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py index 3eaa82981..a97a5a132 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -29,7 +29,7 @@ from flask_security.recoverable import reset_password_token_status, \ from flask_security.signals import reset_password_instructions_sent from flask_security.utils import config_value, do_flash, get_url, \ get_message, slash_url_suffix, login_user, send_mail -from flask_security.views import _security, _commit, default_render_json, _ctx +from flask_security.views import _security, _commit, _ctx from werkzeug.datastructures import MultiDict import config @@ -52,6 +52,14 @@ try: except ImportError as e: import urllib2 as urlreq +try: + from flask_security.views import default_render_json +except ImportError as e: + # Support Flask-Security-Too == 3.2 + import sys + if sys.version_info < (3, 8): + from flask_security.views import _render_json as default_render_json + MODULE_NAME = 'browser'