1) Replace Flask-BabelEx with Flask-Babel. Fixes #6088

2) Upgrade Flask to version 2. Fixes #7010

web/pgadmin/browser/__init__.py

@@ -22,7 +22,7 @@ import six
 import time
 from flask import current_app, render_template, url_for, make_response, \
     flash, Response, request, after_this_request, redirect, session
-from flask_babelex import gettext
+from flask_babel import gettext
 from flask_gravatar import Gravatar
 from flask_login import current_user, login_required
 from flask_security.changeable import change_user_password

web/pgadmin/browser/collection.py

@@ -11,7 +11,7 @@ from abc import ABCMeta, abstractmethod
 
 import six
 from flask import url_for, render_template
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser import BrowserPluginModule
 from pgadmin.browser.utils import PGChildModule
 from pgadmin.utils import PgAdminModule

web/pgadmin/browser/register_browser_preferences.py

@@ -7,7 +7,7 @@
 #
 ##########################################################################
 import sys
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.utils.constants import PREF_LABEL_DISPLAY,\
     PREF_LABEL_KEYBOARD_SHORTCUTS, PREF_LABEL_TABS_SETTINGS, \
     PREF_LABEL_OPTIONS, QT_DEFAULT_PLACEHOLDER

web/pgadmin/browser/server_groups/__init__.py

@@ -14,7 +14,7 @@ from abc import ABCMeta, abstractmethod
 
 import six
 from flask import request, jsonify, render_template
-from flask_babelex import gettext
+from flask_babel import gettext
 from flask_security import current_user, login_required
 from pgadmin.browser import BrowserPluginModule
 from pgadmin.browser.utils import NodeView

web/pgadmin/browser/server_groups/servers/__init__.py

@@ -11,7 +11,7 @@ import simplejson as json
 import pgadmin.browser.server_groups as sg
 from flask import render_template, request, make_response, jsonify, \
     current_app, url_for, session
-from flask_babelex import gettext
+from flask_babel import gettext
 from flask_security import current_user, login_required
 from pgadmin.browser.server_groups.servers.types import ServerType
 from pgadmin.browser.utils import PGChildNodeView
@@ -302,19 +302,18 @@ class ServerModule(sg.ServerGroupPluginModule):
 
         return scripts
 
-    def register(self, app, options, first_registration=False):
+    def register(self, app, options):
         """
         Override the default register function to automagically register
         sub-modules at once.
         """
-        if first_registration:
-            driver = get_driver(PG_DEFAULT_DRIVER, app)
-            app.jinja_env.filters['qtLiteral'] = driver.qtLiteral
-            app.jinja_env.filters['qtIdent'] = driver.qtIdent
-            app.jinja_env.filters['qtTypeIdent'] = driver.qtTypeIdent
-            app.jinja_env.filters['hasAny'] = has_any
+        driver = get_driver(PG_DEFAULT_DRIVER, app)
+        app.jinja_env.filters['qtLiteral'] = driver.qtLiteral
+        app.jinja_env.filters['qtIdent'] = driver.qtIdent
+        app.jinja_env.filters['qtTypeIdent'] = driver.qtTypeIdent
+        app.jinja_env.filters['hasAny'] = has_any
 
-        super(ServerModule, self).register(app, options, first_registration)
+        super(ServerModule, self).register(app, options)
 
     # We do not have any preferences for server node.
     def register_preferences(self):

web/pgadmin/browser/server_groups/servers/databases/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, current_app, request, jsonify
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from flask_security import current_user
 
 import pgadmin.browser.server_groups.servers as servers

web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.utils.ajax import make_json_response, internal_server_error, \

web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py

@@ -13,7 +13,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as database
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.utils.ajax import make_json_response, internal_server_error, \

web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.utils.ajax import make_json_response, \

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
     parse_priv_to_db, validate_options, tokenize_options

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from flask import render_template, make_response, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
     parse_priv_to_db, validate_options, tokenize_options

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py

@@ -16,7 +16,7 @@ import pgadmin.browser.server_groups.servers as servers
 from pgadmin.browser.server_groups.servers.utils import \
     validate_options, tokenize_options
 from flask import render_template, make_response, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.utils.ajax import make_json_response, internal_server_error, \

web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
     parse_priv_to_db

web/pgadmin/browser/server_groups/servers/databases/publications/__init__.py

@@ -13,7 +13,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.utils.ajax import make_json_response, internal_server_error, \

web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py

@@ -12,7 +12,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, request, jsonify, current_app
-from flask_babelex import gettext
+from flask_babel import gettext
 
 import pgadmin.browser.server_groups.servers as servers
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/__init__.py

@@ -12,7 +12,7 @@
 from functools import wraps
 
 from flask import render_template
-from flask_babelex import gettext
+from flask_babel import gettext
 
 import pgadmin.browser.server_groups.servers.databases as database
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py

@@ -12,7 +12,7 @@
 from functools import wraps
 
 from flask import render_template
-from flask_babelex import gettext
+from flask_babel import gettext
 
 import pgadmin.browser.server_groups.servers.databases as database
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py

@@ -12,7 +12,7 @@
 from functools import wraps
 
 from flask import render_template
-from flask_babelex import gettext
+from flask_babel import gettext
 
 import pgadmin.browser.server_groups.servers.databases as database
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py

@@ -13,7 +13,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 
 import pgadmin.browser.server_groups.servers.databases as database
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py

@@ -13,7 +13,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, make_response, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 
 import pgadmin.browser.server_groups.servers.databases.schemas.domains \
     as domains

web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py

@@ -16,7 +16,7 @@ from functools import wraps
 import simplejson as json
 from flask import render_template, make_response, request, jsonify, \
     current_app
-from flask_babelex import gettext
+from flask_babel import gettext
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py

@@ -13,7 +13,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, make_response, current_app, request, jsonify
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py

@@ -13,7 +13,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, make_response, current_app, request, jsonify
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py

@@ -13,7 +13,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, request, jsonify, current_app
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 
 from config import PG_DEFAULT_DRIVER
 from pgadmin.browser.server_groups.servers.databases import DatabaseModule

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py

@@ -13,7 +13,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, make_response, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 
 from config import PG_DEFAULT_DRIVER
 from pgadmin.browser.server_groups.servers.databases import DatabaseModule

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py

@@ -18,7 +18,7 @@ from functools import wraps
 import simplejson as json
 from flask import render_template, request, jsonify, \
     current_app
-from flask_babelex import gettext
+from flask_babel import gettext
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/operators/__init__.py

@@ -12,7 +12,7 @@
 from functools import wraps
 
 from flask import render_template
-from flask_babelex import gettext
+from flask_babel import gettext
 
 import pgadmin.browser.server_groups.servers.databases as database
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py

@@ -13,7 +13,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, make_response, request, jsonify
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 
 import pgadmin.browser.server_groups.servers.databases as database
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py

@@ -14,7 +14,7 @@ import re
 from functools import wraps
 
 from flask import render_template, make_response
-from flask_babelex import gettext
+from flask_babel import gettext
 
 import pgadmin.browser.server_groups.servers.databases\
     .schemas.packages as packages

web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py

@@ -12,7 +12,7 @@
 from functools import wraps
 
 from flask import render_template, make_response
-from flask_babelex import gettext
+from flask_babel import gettext
 
 import pgadmin.browser.server_groups.servers.databases.schemas \
     .packages as packages

web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py

@@ -13,7 +13,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, request, jsonify
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 
 import pgadmin.browser.server_groups.servers.databases as database
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as database
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.server_groups.servers.databases.schemas.utils \
     import SchemaChildModule
 from pgadmin.browser.utils import PGChildNodeView

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py

@@ -14,7 +14,7 @@ import re
 
 import pgadmin.browser.server_groups.servers.databases as database
 from flask import render_template, request, jsonify, url_for, current_app
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.server_groups.servers.databases.schemas.utils \
     import SchemaChildModule, DataTypeReader, VacuumSettings
 from pgadmin.browser.server_groups.servers.utils import parse_priv_to_db

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as database
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.server_groups.servers.databases.schemas.utils \
     import DataTypeReader

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/utils.py

@@ -10,7 +10,7 @@
 """ Implements Utility class for Compound Triggers. """
 
 from flask import render_template
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.utils.ajax import internal_server_error
 from pgadmin.utils.exception import ExecuteError
 from pgadmin.browser.server_groups.servers.databases.schemas.utils \

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as database
 from flask import render_template, request, jsonify, current_app
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.utils.ajax import make_json_response, internal_server_error, \

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/utils.py

@@ -10,7 +10,7 @@
 """ Implements Utility class for Compound Triggers. """
 
 from flask import render_template
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.utils.ajax import internal_server_error
 from pgadmin.utils.exception import ObjectGone, ExecuteError
 from pgadmin.browser.server_groups.servers.databases.schemas.utils \

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py

@@ -15,7 +15,7 @@ from functools import wraps
 from pgadmin.utils.driver import get_driver
 import pgadmin.browser.server_groups.servers.databases as database
 from flask import render_template, make_response
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.utils.ajax import make_json_response, \
     make_response as ajax_response, internal_server_error

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as database
 from flask import render_template, make_response, request, jsonify
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.server_groups.servers.databases.schemas.tables.\
     constraints.type import ConstraintRegistry

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/utils.py

@@ -10,7 +10,7 @@
 """ Implements Utility class for Check Constraint. """
 
 from flask import render_template
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.utils.ajax import internal_server_error
 from pgadmin.utils.exception import ObjectGone, ExecuteError
 from functools import wraps

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as database
 from flask import render_template, make_response, request, jsonify
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.browser.server_groups.servers.databases.schemas.tables.\
     constraints.type import ConstraintRegistry, ConstraintTypeModule
 from pgadmin.browser.utils import PGChildNodeView

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/utils.py

@@ -10,7 +10,7 @@
 """ Implements Utility class for Exclusion Constraint. """
 
 from flask import render_template
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.utils.ajax import internal_server_error
 from pgadmin.utils.exception import ObjectGone, ExecuteError
 from functools import wraps

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as database
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.server_groups.servers.databases.schemas.tables.\
     constraints.type import ConstraintRegistry, ConstraintTypeModule
 from pgadmin.browser.utils import PGChildNodeView

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/utils.py

@@ -10,7 +10,7 @@
 """ Implements Utility class for Foreign Keys. """
 
 from flask import render_template
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.utils.ajax import internal_server_error
 from pgadmin.utils.exception import ObjectGone, ExecuteError
 from functools import wraps

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as database
 from flask import render_template, make_response, request, jsonify
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.browser.server_groups.servers.databases.schemas.tables.\
     constraints.type import ConstraintRegistry, ConstraintTypeModule
 from pgadmin.browser.utils import PGChildNodeView

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/utils.py

@@ -10,7 +10,7 @@
 """ Implements Utility class for Index Constraint. """
 
 from flask import render_template
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.utils.ajax import internal_server_error
 from pgadmin.utils.exception import ObjectGone, ExecuteError
 from functools import wraps

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as database
 from flask import render_template, request, jsonify, current_app
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.server_groups.servers.databases.schemas.tables.\
     partitions import backend_supported

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py

@@ -10,7 +10,7 @@
 """ Implements Utility class for Indexes. """
 
 from flask import render_template
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.utils.ajax import internal_server_error
 from pgadmin.utils.exception import ObjectGone, ExecuteError
 from functools import wraps

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py

@@ -14,7 +14,7 @@ import random
 import simplejson as json
 import pgadmin.browser.server_groups.servers.databases.schemas as schema
 from flask import render_template, request, current_app
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.server_groups.servers.databases.schemas.utils \
     import DataTypeReader, VacuumSettings
 from pgadmin.utils.ajax import internal_server_error, \
@@ -116,34 +116,28 @@ class PartitionsModule(CollectionNodeModule):
         """
         return backend_supported(self, manager, **kwargs)
 
-    def register(self, app, options, first_registration=False):
+    def register(self, app, options):
         """
         Override the default register function to automatically register
         sub-modules of table node under partition table node.
         """
 
-        if first_registration:
-            self.submodules = list(app.find_submodules(self.import_name))
-
-        super(CollectionNodeModule, self).register(
-            app, options, first_registration
-        )
+        self.submodules = list(app.find_submodules(self.import_name))
+        super(CollectionNodeModule, self).register(app, options)
 
         for module in self.submodules:
-            if first_registration:
-                module.parentmodules.append(self)
+            module.parentmodules.append(self)
             app.register_blueprint(module)
 
         # Now add sub modules of table node to partition table node.
-        if first_registration:
-            # Exclude 'partition' module for now to avoid cyclic import issue.
-            modules_to_skip = ['partition', 'column']
-            for parent in self.parentmodules:
-                if parent.node_type == 'table':
-                    self.submodules += [
-                        submodule for submodule in parent.submodules
-                        if submodule.node_type not in modules_to_skip
-                    ]
+        # Exclude 'partition' module for now to avoid cyclic import issue.
+        modules_to_skip = ['partition', 'column']
+        for parent in self.parentmodules:
+            if parent.node_type == 'table':
+                self.submodules += [
+                    submodule for submodule in parent.submodules
+                    if submodule.node_type not in modules_to_skip
+                ]
 
     @property
     def module_use_template_javascript(self):

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from flask import render_template, request, jsonify, current_app
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.utils.ajax import make_json_response, internal_server_error, \

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/utils.py

@@ -10,7 +10,7 @@
 """ Implements Utility class for row level security. """
 
 from flask import render_template
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.utils.ajax import internal_server_error
 from pgadmin.utils.exception import ObjectGone, ExecuteError
 from functools import wraps

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py

@@ -15,7 +15,7 @@ from functools import wraps
 import pgadmin.browser.server_groups.servers.databases.schemas as schemas
 from flask import render_template, make_response, request, jsonify,\
     current_app
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.server_groups.servers.databases.schemas.utils import \
     parse_rule_definition

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as database
 from flask import render_template, request, jsonify, current_app
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.utils.ajax import make_json_response, internal_server_error, \

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/utils.py

@@ -10,7 +10,7 @@
 """ Implements Utility class for Triggers. """
 
 from flask import render_template
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.utils.ajax import internal_server_error
 from pgadmin.utils.exception import ObjectGone, ExecuteError
 from pgadmin.browser.server_groups.servers.databases.schemas.utils \

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py

@@ -14,7 +14,7 @@ import copy
 from functools import wraps
 import simplejson as json
 from flask import render_template, jsonify, request
-from flask_babelex import gettext
+from flask_babel import gettext
 
 from pgadmin.browser.server_groups.servers.databases.schemas\
     .tables.base_partition_table import BasePartitionTable

web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py

@@ -13,7 +13,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 import re
 
 import pgadmin.browser.server_groups.servers.databases as database

web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py

@@ -15,7 +15,7 @@ from functools import wraps
 
 import simplejson as json
 from flask import render_template, request, jsonify, current_app
-from flask_babelex import gettext
+from flask_babel import gettext
 from flask_security import current_user
 import pgadmin.browser.server_groups.servers.databases as databases
 from config import PG_DEFAULT_DRIVER

web/pgadmin/browser/server_groups/servers/databases/subscriptions/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers.databases as databases
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.utils.ajax import make_json_response, internal_server_error, \

web/pgadmin/browser/server_groups/servers/pgagent/__init__.py

@@ -13,7 +13,7 @@ import simplejson as json
 from datetime import datetime, time
 
 from flask import render_template, request, jsonify
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 
 from config import PG_DEFAULT_DRIVER
 

web/pgadmin/browser/server_groups/servers/pgagent/schedules/__init__.py

@@ -13,7 +13,7 @@ import simplejson as json
 from functools import wraps
 
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.utils.ajax import make_json_response, gone, \

web/pgadmin/browser/server_groups/servers/pgagent/steps/__init__.py

@@ -13,7 +13,7 @@ import simplejson as json
 from functools import wraps
 
 from flask import render_template, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
 from pgadmin.utils.ajax import make_json_response, gone, \

web/pgadmin/browser/server_groups/servers/ppas.py

@@ -7,7 +7,7 @@
 #
 ##########################################################################
 
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.server_groups.servers.types import ServerType
 
 

web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py

@@ -14,7 +14,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers as servers
 from flask import render_template, make_response, request, jsonify
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import NodeView
 from pgadmin.utils.ajax import make_json_response, \

web/pgadmin/browser/server_groups/servers/roles/__init__.py

@@ -12,7 +12,7 @@ from functools import wraps
 import pgadmin.browser.server_groups as sg
 import simplejson as json
 from flask import render_template, request, jsonify, current_app
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 import dateutil.parser as dateutil_parser
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
@@ -23,7 +23,7 @@ from pgadmin.utils.driver import get_driver
 from pgadmin.utils.constants import ERROR_FETCHING_ROLE_INFORMATION
 
 from config import PG_DEFAULT_DRIVER
-from flask_babelex import gettext
+from flask_babel import gettext
 
 _REASSIGN_OWN_SQL = 'reassign_own.sql'
 

web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py

@@ -12,7 +12,7 @@ from functools import wraps
 
 import pgadmin.browser.server_groups.servers as servers
 from flask import render_template, make_response, request, jsonify, current_app
-from flask_babelex import gettext
+from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
     parse_priv_to_db

web/pgadmin/browser/server_groups/servers/types.py

@@ -13,7 +13,7 @@ import config
 import copy
 
 from flask import render_template
-from flask_babelex import gettext as _
+from flask_babel import gettext as _
 from pgadmin.utils.preferences import Preferences
 from werkzeug.exceptions import InternalServerError
 from pgadmin.utils.constants import BINARY_PATHS

web/pgadmin/browser/utils.py

@@ -13,8 +13,8 @@ from abc import abstractmethod
 
 import flask
 from flask import render_template, current_app
-from flask.views import View, MethodViewType, with_metaclass
-from flask_babelex import gettext
+from flask.views import View, MethodViewType
+from flask_babel import gettext
 
 from config import PG_DEFAULT_DRIVER
 from pgadmin.utils.ajax import make_json_response, precondition_required,\
@@ -139,7 +139,7 @@ class PGChildModule(object):
         pass
 
 
-class NodeView(with_metaclass(MethodViewType, View)):
+class NodeView(View, metaclass=MethodViewType):
     """
     A PostgreSQL Object has so many operaions/functions apart from CRUD
     (Create, Read, Update, Delete):