python 3 updates

- Fix super() calls for python 3
- No need to inherit objects.
- No need for u at the start of strings
- Tidied up some brackets and f-strings too

tools/copyright_updater.py

@@ -82,7 +82,7 @@ def help():
     print("\nInvalid command line options. Usage:")
     print("\t{0} <year to find> <year to replace>".format(sys.argv[0]))
     print("\tExample: {0} 2018 2019\n".format(sys.argv[0]))
-    exit(1)
+    sys.exit(1)
 
 
 if __name__ == '__main__':

web/pgAdmin4.py

@@ -47,7 +47,7 @@ from pgadmin.model import SCHEMA_VERSION
 ##########################################################################
 # Support reverse proxying
 ##########################################################################
-class ReverseProxied(object):
+class ReverseProxied():
     def __init__(self, app):
         self.app = app
         # https://werkzeug.palletsprojects.com/en/0.15.x/middleware/proxy_fix

web/pgadmin/__init__.py

@@ -76,7 +76,7 @@ class PgAdmin(Flask):
         )
         self.logout_hooks = []
 
-        super(PgAdmin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def find_submodules(self, basemodule):
         try:
@@ -472,7 +472,7 @@ def create_app(app_name=None):
 
     # Don't bother paths when running in cli mode
     if not cli_mode:
-        import pgadmin.utils.paths as paths
+        from pgadmin.utils import paths
         paths.init_app()
 
     # Setup Flask-Security
@@ -756,7 +756,7 @@ def create_app(app_name=None):
         HTTP request to avoid Host Header Injection attack
         :return: None/JSON response with 403 HTTP status code
         """
-        client_host = str(request.host).split(':')[0]
+        client_host = str(request.host).split(':', maxsplit=1)[0]
         valid = True
         allowed_hosts = config.ALLOWED_HOSTS
 

web/pgadmin/authenticate/internal.py

@@ -20,7 +20,7 @@ from pgadmin.utils.validation_utils import validate_email
 from pgadmin.utils.constants import INTERNAL
 
 
-class BaseAuthentication(object, metaclass=AuthSourceRegistry):
+class BaseAuthentication(metaclass=AuthSourceRegistry):
 
     DEFAULT_MSG = {
         'USER_DOES_NOT_EXIST': gettext('Incorrect username or password.'),

web/pgadmin/authenticate/kerberos.py

@@ -56,7 +56,7 @@ class KerberosModule(PgAdminModule):
     def register(self, app, options):
         # Do not look for the sub_modules,
         # instead call blueprint.register(...) directly
-        super(PgAdminModule, self).register(app, options)
+        super().register(app, options)
 
     def get_exposed_url_endpoints(self):
         return ['kerberos.login',

web/pgadmin/authenticate/mfa/tests/test_mfa.py

@@ -41,7 +41,7 @@ class TestMFATests(BaseTestGenerator):
         if start is not None:
             start(self)
 
-        super(BaseTestGenerator, self).setUp()
+        super().setUp()
 
     def tearDown(self):
 
@@ -50,7 +50,7 @@ class TestMFATests(BaseTestGenerator):
             finish(self)
 
         config.MFA_SUPPORTED_METHODS = []
-        super(BaseTestGenerator, self).tearDown()
+        super().tearDown()
 
     def runTest(self):
         self.check(self)

web/pgadmin/authenticate/mfa/tests/test_mfa_view.py

@@ -50,8 +50,8 @@ def check_validation_view_content(test):
 
                         response = test.tester.get("/mfa/validate")
 
-    test.assertEquals(response.status_code, 200)
-    test.assertEquals(
+    test.assertEqual(response.status_code, 200)
+    test.assertEqual(
         response.headers["Content-Type"], "text/html; charset=utf-8"
     )
     # test.assertTrue('Dummy' in response.data.decode('utf8'))

web/pgadmin/authenticate/oauth2.py

@@ -34,7 +34,7 @@ class Oauth2Module(PgAdminModule):
     def register(self, app, options):
         # Do not look for the sub_modules,
         # instead call blueprint.register(...) directly
-        super(PgAdminModule, self).register(app, options)
+        super().register(app, options)
 
     def get_exposed_url_endpoints(self):
         return [OAUTH2_AUTHORIZE,

web/pgadmin/authenticate/webserver.py

@@ -29,7 +29,7 @@ class WebserverModule(PgAdminModule):
     def register(self, app, options):
         # Do not look for the sub_modules,
         # instead call blueprint.register(...) directly
-        super(PgAdminModule, self).register(app, options)
+        super().register(app, options)
 
     def get_exposed_url_endpoints(self):
         return ['webserver.login',

web/pgadmin/browser/__init__.py

@@ -220,7 +220,7 @@ class BrowserModule(PgAdminModule):
         """
         from .server_groups import blueprint as module
         self.submodules.append(module)
-        super(BrowserModule, self).register(app, options)
+        super().register(app, options)
 
 
 blueprint = BrowserModule(MODULE_NAME, __name__)
@@ -266,7 +266,7 @@ class BrowserPluginModule(PgAdminModule, metaclass=ABCMeta):
         self.pref_show_system_objects = None
         self.pref_show_node = None
 
-        super(BrowserPluginModule, self).__init__(
+        super().__init__(
             "NODE-%s" % self.node_type,
             import_name,
             **kwargs

web/pgadmin/browser/server_groups/__init__.py

@@ -129,13 +129,13 @@ class ServerGroupModule(BrowserPluginModule):
         """
         from .servers import blueprint as module
         self.submodules.append(module)
-        super(BrowserPluginModule, self).register(app, options)
+        super().register(app, options)
 
 
 class ServerGroupMenuItem(MenuItem):
     def __init__(self, **kwargs):
         kwargs.setdefault("type", ServerGroupModule.node_type)
-        super(ServerGroupMenuItem, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
 
 class ServerGroupPluginModule(BrowserPluginModule, metaclass=ABCMeta):

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

@@ -311,7 +311,7 @@ class ServerModule(sg.ServerGroupPluginModule):
         from .tablespaces import blueprint as module
         self.submodules.append(module)
 
-        super(ServerModule, self).register(app, options)
+        super().register(app, options)
 
     # We do not have any preferences for server node.
     def register_preferences(self):
@@ -404,7 +404,7 @@ class ServerModule(sg.ServerGroupPluginModule):
 class ServerMenuItem(MenuItem):
     def __init__(self, **kwargs):
         kwargs.setdefault("type", ServerModule.node_type)
-        super(ServerMenuItem, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
 
 blueprint = ServerModule(__name__)
@@ -1325,7 +1325,7 @@ class ServerNode(PGChildNodeView):
                 status=200,
                 success=0,
                 errormsg=gettext(
-                    u"Please enter the server details to connect")
+                    "Please enter the server details to connect")
             )
         if current_user and hasattr(current_user, 'id'):
             # Fetch User Details.

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

@@ -17,7 +17,7 @@ from flask import render_template, current_app, request, jsonify
 from flask_babel import gettext as _
 from flask_security import current_user
 
-import pgadmin.browser.server_groups.servers as servers
+from pgadmin.browser.server_groups import servers
 from config import PG_DEFAULT_DRIVER
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.server_groups.servers.databases.utils import \
@@ -47,7 +47,7 @@ class DatabaseModule(CollectionNodeModule):
         self.min_ver = None
         self.max_ver = None
 
-        super(DatabaseModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_nodes(self, gid, sid):
         """
@@ -127,7 +127,7 @@ class DatabaseModule(CollectionNodeModule):
         from .subscriptions import blueprint as module
         self.submodules.append(module)
 
-        super(DatabaseModule, self).register(app, options)
+        super().register(app, options)
 
 
 blueprint = DatabaseModule(__name__)

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

@@ -12,7 +12,7 @@
 import simplejson as json
 from functools import wraps
 
-import pgadmin.browser.server_groups.servers.databases as databases
+from pgadmin.browser.server_groups.servers import databases
 from flask import render_template, request, jsonify
 from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
@@ -51,7 +51,7 @@ class CastModule(CollectionNodeModule):
     _COLLECTION_LABEL = gettext('Casts')
 
     def __init__(self, *args, **kwargs):
-        super(CastModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_nodes(self, gid, sid, did):
         """
@@ -190,7 +190,7 @@ class CastView(PGChildNodeView, SchemaDiffObjectCompare):
         self.conn = None
         self.template_path = None
         self.manager = None
-        super(CastView, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def check_precondition(f):
         """

web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create.py

@@ -24,7 +24,7 @@ class CastsCreateTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will get data required to create cast."""
-        super(CastsCreateTestCase, self).runTest()
+        super().runTest()
         self.data = self.test_data
 
     def runTest(self):

web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create_get_functions.py

@@ -23,7 +23,7 @@ class CastsCreateGetFunctionsTestCase(BaseTestGenerator):
 
     def runTest(self):
         """ This function will add cast under test database. """
-        super(CastsCreateGetFunctionsTestCase, self).runTest()
+        super().runTest()
         self.data = self.test_data
         self.server_data = parent_node_dict["database"][-1]
         self.server_id = self.server_data["server_id"]

web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create_get_type.py

@@ -23,7 +23,7 @@ class CastsCreateGettypeTestCase(BaseTestGenerator):
 
     def runTest(self):
         """ This function will add cast under test database. """
-        super(CastsCreateGettypeTestCase, self).runTest()
+        super().runTest()
         self.server_data = parent_node_dict["database"][-1]
         self.server_id = self.server_data["server_id"]
         self.db_id = self.server_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py

@@ -24,7 +24,7 @@ class CastsDeleteTestCase(BaseTestGenerator):
                                          cast_utils.test_cases)
 
     def setUp(self):
-        super(CastsDeleteTestCase, self).setUp()
+        super().setUp()
         self.inv_data = self.inventory_data
         self.default_db = self.server["db"]
         self.database_info = parent_node_dict['database'][-1]

web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete_multiple.py

@@ -24,7 +24,7 @@ class CastsMultipleDeleteTestCase(BaseTestGenerator):
                                          cast_utils.test_cases)
 
     def setUp(self):
-        super(CastsMultipleDeleteTestCase, self).setUp()
+        super().setUp()
         self.inv_data = self.inventory_data
         self.default_db = self.server["db"]
         self.database_info = parent_node_dict['database'][-1]

web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py

@@ -23,7 +23,7 @@ class CastsGetTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create cast."""
-        super(CastsGetTestCase, self).setUp()
+        super().setUp()
         self.inv_data = self.inventory_data
         self.default_db = self.server["db"]
         self.database_info = parent_node_dict['database'][-1]

web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_dependencies_dependent.py

@@ -24,7 +24,7 @@ class CastsGetDependentsAndDependencyTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create cast."""
-        super(CastsGetDependentsAndDependencyTestCase, self).setUp()
+        super().setUp()
         self.inv_data = self.inventory_data
         self.default_db = self.server["db"]
         self.database_info = parent_node_dict['database'][-1]

web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_node.py

@@ -24,7 +24,7 @@ class CastsGetNodeTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create cast."""
-        super(CastsGetNodeTestCase, self).setUp()
+        super().setUp()
         self.inv_data = self.inventory_data
         self.default_db = self.server["db"]
         self.database_info = parent_node_dict['database'][-1]

web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_sql.py

@@ -24,7 +24,7 @@ class CastsGetSqlTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create cast."""
-        super(CastsGetSqlTestCase, self).setUp()
+        super().setUp()
         self.inv_data = self.inventory_data
         self.default_db = self.server["db"]
         self.database_info = parent_node_dict['database'][-1]

web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py

@@ -24,7 +24,7 @@ class CastsPutTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create cast."""
-        super(CastsPutTestCase, self).setUp()
+        super().setUp()
         self.inv_data = self.inventory_data
         self.data = self.test_data
         self.default_db = self.server["db"]

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

@@ -57,7 +57,7 @@ class EventTriggerModule(CollectionNodeModule):
             *args:
             **kwargs:
         """
-        super(EventTriggerModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.min_ver = 90300
         self.max_ver = None
 

web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py

@@ -13,7 +13,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
-from pgadmin.utils import server_utils as server_utils
+from pgadmin.utils import server_utils
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression import trigger_funcs_utils

web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py

@@ -12,7 +12,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
-from pgadmin.utils import server_utils as server_utils
+from pgadmin.utils import server_utils
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression import trigger_funcs_utils

web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py

@@ -14,7 +14,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
-from pgadmin.utils import server_utils as server_utils
+from pgadmin.utils import server_utils
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression import trigger_funcs_utils

web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_dependancy_dependent.py

@@ -13,7 +13,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
-from pgadmin.utils import server_utils as server_utils
+from pgadmin.utils import server_utils
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression import trigger_funcs_utils

web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_functions.py

@@ -13,7 +13,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
-from pgadmin.utils import server_utils as server_utils
+from pgadmin.utils import server_utils
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression import trigger_funcs_utils

web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py

@@ -12,7 +12,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
-from pgadmin.utils import server_utils as server_utils
+from pgadmin.utils import server_utils
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression import trigger_funcs_utils

web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py

@@ -13,7 +13,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
-from pgadmin.utils import server_utils as server_utils
+from pgadmin.utils import server_utils
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression import trigger_funcs_utils

web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_sql.py

@@ -12,7 +12,7 @@ from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
-from pgadmin.utils import server_utils as server_utils
+from pgadmin.utils import server_utils
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression import trigger_funcs_utils

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

@@ -12,7 +12,7 @@
 import simplejson as json
 from functools import wraps
 
-import pgadmin.browser.server_groups.servers.databases as databases
+from pgadmin.browser.server_groups.servers import databases
 from flask import render_template, request, jsonify
 from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
@@ -29,7 +29,7 @@ from pgadmin.tools.schema_diff.compare import SchemaDiffObjectCompare
 
 class ExtensionModule(CollectionNodeModule):
     """
-    class ExtensionModule(Object):
+    class ExtensionModule():
 
         A collection Node which inherits CollectionNodeModule
         class and define methods to get child nodes, to load its own
@@ -42,7 +42,7 @@ class ExtensionModule(CollectionNodeModule):
         """
         Initialising the base class
         """
-        super(ExtensionModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_nodes(self, gid, sid, did):
         """

web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py

@@ -26,7 +26,7 @@ class ExtensionsAddTestCase(BaseTestGenerator):
 
     def runTest(self):
         """ This function will add extension under test schema. """
-        super(ExtensionsAddTestCase, self).runTest()
+        super().runTest()
         self.schema_data = parent_node_dict["schema"][-1]
         self.server_id = self.schema_data["server_id"]
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py

@@ -24,7 +24,7 @@ class ExtensionsDeleteTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension."""
-        super(ExtensionsDeleteTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py

@@ -25,7 +25,7 @@ class ExtensionsDeleteMultipleTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extensions."""
-        super(ExtensionsDeleteMultipleTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py

@@ -24,7 +24,7 @@ class ExtensionsGetTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension."""
-        super(ExtensionsGetTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py

@@ -26,7 +26,7 @@ class ExtensionsPutTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension."""
-        super(ExtensionsPutTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

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

@@ -12,7 +12,7 @@
 import simplejson as json
 from functools import wraps
 
-import pgadmin.browser.server_groups.servers.databases as databases
+from pgadmin.browser.server_groups.servers import databases
 from flask import render_template, request, jsonify
 from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
@@ -64,7 +64,7 @@ class ForeignDataWrapperModule(CollectionNodeModule):
         self.min_ver = None
         self.max_ver = None
 
-        super(ForeignDataWrapperModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_nodes(self, gid, sid, did):
         """
@@ -102,7 +102,7 @@ class ForeignDataWrapperModule(CollectionNodeModule):
         """
         from .foreign_servers import blueprint as module
         self.submodules.append(module)
-        super(ForeignDataWrapperModule, self).register(app, options)
+        super().register(app, options)
 
 
 blueprint = ForeignDataWrapperModule(__name__)

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

@@ -12,7 +12,7 @@
 import simplejson as json
 from functools import wraps
 
-import pgadmin.browser.server_groups.servers.databases as databases
+from pgadmin.browser.server_groups.servers import databases
 from flask import render_template, make_response, request, jsonify
 from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
@@ -64,7 +64,7 @@ class ForeignServerModule(CollectionNodeModule):
         self.min_ver = None
         self.max_ver = None
 
-        super(ForeignServerModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_nodes(self, gid, sid, did, fid):
         """
@@ -103,7 +103,7 @@ class ForeignServerModule(CollectionNodeModule):
         """
         from .user_mappings import blueprint as module
         self.submodules.append(module)
-        super(ForeignServerModule, self).register(app, options)
+        super().register(app, options)
 
 
 blueprint = ForeignServerModule(__name__)

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py

@@ -33,7 +33,7 @@ class ForeignServerAddTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(ForeignServerAddTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py

@@ -28,7 +28,7 @@ class ForeignServerDeleteTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(ForeignServerDeleteTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py

@@ -28,7 +28,7 @@ class ForeignServerDeleteMultipleTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(ForeignServerDeleteMultipleTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_dependent_dependency.py

@@ -28,7 +28,7 @@ class ForeignServerDependentsAndDependencyTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(ForeignServerDependentsAndDependencyTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py

@@ -30,7 +30,7 @@ class ForeignServerGetTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(ForeignServerGetTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_msql.py

@@ -29,7 +29,7 @@ class ForeignServerGetSQLTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(ForeignServerGetSQLTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_node.py

@@ -28,7 +28,7 @@ class ForeignServerGetNodeTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(ForeignServerGetNodeTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py

@@ -31,7 +31,7 @@ class ForeignServerPutTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(ForeignServerPutTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_sql.py

@@ -30,7 +30,7 @@ class ForeignServerGetSQLTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(ForeignServerGetSQLTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

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

@@ -12,7 +12,7 @@
 import simplejson as json
 from functools import wraps
 
-import pgadmin.browser.server_groups.servers as servers
+from pgadmin.browser.server_groups import servers
 from pgadmin.browser.server_groups.servers.utils import \
     validate_options, tokenize_options
 from flask import render_template, make_response, request, jsonify
@@ -69,7 +69,7 @@ class UserMappingModule(CollectionNodeModule):
         self.min_ver = None
         self.max_ver = None
 
-        super(UserMappingModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_nodes(self, gid, sid, did, fid, fsid):
         """

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

@@ -33,7 +33,7 @@ class UserMappingAddTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(UserMappingAddTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

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

@@ -32,7 +32,7 @@ class UserMappingDeleteTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(UserMappingDeleteTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

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

@@ -32,7 +32,7 @@ class UserMappingDeleteMultipleTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(UserMappingDeleteMultipleTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

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

@@ -34,7 +34,7 @@ class UserMappingDependentsAndDependencyTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(UserMappingDependentsAndDependencyTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

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

@@ -32,7 +32,7 @@ class UserMappingGetTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(UserMappingGetTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

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

@@ -31,7 +31,7 @@ class UserMappingGetMSQLTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(UserMappingGetMSQLTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

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

@@ -32,7 +32,7 @@ class UserMappingNodesTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(UserMappingNodesTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

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

@@ -33,7 +33,7 @@ class UserMappingPutTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(UserMappingPutTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

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

@@ -32,7 +32,7 @@ class UserMappingGetSQLTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(UserMappingGetSQLTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py

@@ -27,7 +27,7 @@ class FDWDAddTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension."""
-        super(FDWDAddTestCase, self).setUp()
+        super().setUp()
 
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py

@@ -26,7 +26,7 @@ class FDWDeleteTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(FDWDeleteTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py

@@ -26,7 +26,7 @@ class FDWDDeleteMultipleTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(FDWDDeleteMultipleTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_dependency_dependent.py

@@ -25,7 +25,7 @@ class FDWDependencyAndDependentTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(FDWDependencyAndDependentTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get-handlers.py

@@ -26,7 +26,7 @@ class FDWHandlersTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(FDWHandlersTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py

@@ -27,7 +27,7 @@ class FDWDGetTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(FDWDGetTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_nodes.py

@@ -27,7 +27,7 @@ class FDWDNodesTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(FDWDNodesTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_validators.py

@@ -26,7 +26,7 @@ class FDWValidatorsTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(FDWValidatorsTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_msql.py

@@ -26,7 +26,7 @@ class FDWDGetMSQLTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(FDWDGetMSQLTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py

@@ -27,7 +27,7 @@ class FDWDPutTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(FDWDPutTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_sql.py

@@ -26,7 +26,7 @@ class FDWDGetSQLTestCase(BaseTestGenerator):
 
     def setUp(self):
         """ This function will create extension and foreign data wrapper."""
-        super(FDWDGetSQLTestCase, self).setUp()
+        super().setUp()
         self.schema_data = parent_node_dict['schema'][-1]
         self.server_id = self.schema_data['server_id']
         self.db_id = self.schema_data['db_id']

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

@@ -12,7 +12,7 @@
 import simplejson as json
 from functools import wraps
 
-import pgadmin.browser.server_groups.servers.databases as databases
+from pgadmin.browser.server_groups.servers import databases
 from flask import render_template, request, jsonify
 from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
@@ -63,7 +63,7 @@ class LanguageModule(CollectionNodeModule):
         self.min_ver = None
         self.max_ver = None
 
-        super(LanguageModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_nodes(self, gid, sid, did):
         """
@@ -214,7 +214,7 @@ class LanguageView(PGChildNodeView, SchemaDiffObjectCompare):
         self.template_path = None
         self.manager = None
 
-        super(LanguageView, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def check_precondition(f):
         """

web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py

@@ -25,7 +25,7 @@ class LanguagesAddTestCase(BaseTestGenerator):
                                          language_utils.test_cases)
 
     def setUp(self):
-        super(LanguagesAddTestCase, self).setUp()
+        super().setUp()
         db_user = self.server['username']
         self.data = self.test_data
         self.data['name'] = "language_%s" % str(uuid.uuid4())[1:8]

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

@@ -11,7 +11,7 @@
 import simplejson as json
 from functools import wraps
 
-import pgadmin.browser.server_groups.servers.databases as databases
+from pgadmin.browser.server_groups.servers import databases
 from flask import render_template, request, jsonify
 from flask_babel import gettext
 from pgadmin.browser.collection import CollectionNodeModule
@@ -60,7 +60,7 @@ class PublicationModule(CollectionNodeModule):
             *args:
             **kwargs:
         """
-        super(PublicationModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.min_ver = self.min_ppasver = 100000
         self.max_ver = None
 
@@ -205,7 +205,7 @@ class PublicationView(PGChildNodeView, SchemaDiffObjectCompare):
         self.template_path = None
         self.manager = None
 
-        super(PublicationView, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def check_precondition(f):
         """

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

@@ -14,7 +14,7 @@ import simplejson as json
 from flask import render_template, request, jsonify, current_app
 from flask_babel import gettext
 
-import pgadmin.browser.server_groups.servers as servers
+from pgadmin.browser.server_groups import servers
 from config import PG_DEFAULT_DRIVER
 from pgadmin.browser.collection import CollectionNodeModule, PGChildModule
 from pgadmin.browser.server_groups.servers.utils import parse_priv_from_db, \
@@ -79,7 +79,7 @@ class SchemaModule(CollectionNodeModule):
         self.min_ver = None
         self.max_ver = None
 
-        super(SchemaModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def get_nodes(self, gid, sid, did):
         """
@@ -168,7 +168,7 @@ class SchemaModule(CollectionNodeModule):
         from .views import mview_blueprint as module
         self.submodules.append(module)
 
-        super(SchemaModule, self).register(app, options)
+        super().register(app, options)
 
 
 class CatalogModule(SchemaModule):
@@ -186,7 +186,7 @@ class CatalogModule(SchemaModule):
         Override the default register function to automagically register
         sub-modules at once.
         """
-        super(CatalogModule, self).register(app, options)
+        super().register(app, options)
 
 
 schema_blueprint = SchemaModule(__name__)
@@ -317,7 +317,7 @@ class SchemaView(PGChildNodeView):
         Initialize the variables used by methods of SchemaView.
         """
 
-        super(SchemaView, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.manager = None
         self.conn = None
@@ -1056,7 +1056,7 @@ class CatalogView(SchemaView):
         Initialize the variables used by methods of SchemaView.
         """
 
-        super(CatalogView, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.template_initial = 'catalog'
 
@@ -1078,7 +1078,7 @@ class CatalogView(SchemaView):
         if scid is None:
             return bad_request('Cannot create a catalog schema!')
 
-        return super(CatalogView, self).get_sql(gid, sid, data, scid)
+        return super().get_sql(gid, sid, data, scid)
 
     @check_precondition
     def sql(self, gid, sid, did, scid):

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

@@ -59,7 +59,7 @@ class AggregateModule(SchemaChildModule):
             **kwargs:
         """
 
-        super(AggregateModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.min_ver = 90100
         self.max_ver = None
 

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

@@ -62,7 +62,7 @@ class CatalogObjectModule(SchemaChildModule):
             *args:
             **kwargs:
         """
-        super(CatalogObjectModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.min_ver = None
         self.max_ver = None
 
@@ -85,7 +85,7 @@ class CatalogObjectModule(SchemaChildModule):
         Override the default register function to automagically register
         sub-modules at once.
         """
-        super(CatalogObjectModule, self).register(app, options)
+        super().register(app, options)
 
         from .columns import blueprint as module
         app.register_blueprint(module)

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

@@ -58,7 +58,7 @@ class CatalogObjectColumnsModule(CollectionNodeModule):
             *args:
             **kwargs:
         """
-        super(CatalogObjectColumnsModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.min_ver = None
         self.max_ver = None
 

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

@@ -62,7 +62,7 @@ class CollationModule(SchemaChildModule):
             **kwargs:
         """
 
-        super(CollationModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.min_ver = 90100
         self.max_ver = None
 

web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py

@@ -27,7 +27,7 @@ class CollationAddTestCase(BaseTestGenerator):
                                          collation_utils.test_cases)
 
     def setUp(self):
-        super(CollationAddTestCase, self).setUp()
+        super().setUp()
         self.database_info = parent_node_dict["database"][-1]
         self.db_name = self.database_info["db_name"]
         self.schema_info = parent_node_dict["schema"][-1]

web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py

@@ -26,7 +26,7 @@ class CollationDeleteTestCase(BaseTestGenerator):
                                          collation_utils.test_cases)
 
     def setUp(self):
-        super(CollationDeleteTestCase, self).setUp()
+        super().setUp()
         self.schema_info = parent_node_dict["schema"][-1]
         self.server_id = self.schema_info["server_id"]
         self.db_id = self.schema_info["db_id"]

web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py

@@ -26,7 +26,7 @@ class CollationDeleteMultipleTestCase(BaseTestGenerator):
                                          collation_utils.test_cases)
 
     def setUp(self):
-        super(CollationDeleteMultipleTestCase, self).setUp()
+        super().setUp()
         self.schema_info = parent_node_dict["schema"][-1]
         self.schema_name = self.schema_info["schema_name"]
         self.db_name = parent_node_dict["database"][-1]["db_name"]

web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_dependency_dependent.py

@@ -26,7 +26,7 @@ class CollationDependentsTestCase(BaseTestGenerator):
                                          collation_utils.test_cases)
 
     def setUp(self):
-        super(CollationDependentsTestCase, self).setUp()
+        super().setUp()
         self.schema_info = parent_node_dict["schema"][-1]
         self.schema_name = self.schema_info["schema_name"]
         self.schema_id = self.schema_info["schema_id"]

web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py

@@ -26,7 +26,7 @@ class CollationGetTestCase(BaseTestGenerator):
                                          collation_utils.test_cases)
 
     def setUp(self):
-        super(CollationGetTestCase, self).setUp()
+        super().setUp()
         self.schema_info = parent_node_dict["schema"][-1]
         self.schema_name = self.schema_info["schema_name"]
         self.schema_id = self.schema_info["schema_id"]

web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_collation_function.py

@@ -26,7 +26,7 @@ class CollationGetTestCase(BaseTestGenerator):
                                          collation_utils.test_cases)
 
     def setUp(self):
-        super(CollationGetTestCase, self).setUp()
+        super().setUp()
         self.schema_info = parent_node_dict["schema"][-1]
         self.schema_name = self.schema_info["schema_name"]
         self.schema_id = self.schema_info["schema_id"]

web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_nodes.py

@@ -26,7 +26,7 @@ class CollationNodesTestCase(BaseTestGenerator):
                                          collation_utils.test_cases)
 
     def setUp(self):
-        super(CollationNodesTestCase, self).setUp()
+        super().setUp()
         self.schema_info = parent_node_dict["schema"][-1]
         self.schema_name = self.schema_info["schema_name"]
         self.db_name = parent_node_dict["database"][-1]["db_name"]

web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py

@@ -27,7 +27,7 @@ class CollationPutTestCase(BaseTestGenerator):
                                          collation_utils.test_cases)
 
     def setUp(self):
-        super(CollationPutTestCase, self).setUp()
+        super().setUp()
         self.schema_info = parent_node_dict["schema"][-1]
         self.schema_name = self.schema_info["schema_name"]
         self.db_name = parent_node_dict["database"][-1]["db_name"]

web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_sql.py

@@ -26,7 +26,7 @@ class CollationSqlTestCase(BaseTestGenerator):
                                          collation_utils.test_cases)
 
     def setUp(self):
-        super(CollationSqlTestCase, self).setUp()
+        super().setUp()
         self.schema_info = parent_node_dict["schema"][-1]
         self.schema_name = self.schema_info["schema_name"]
         self.schema_id = self.schema_info["schema_id"]

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

@@ -15,7 +15,7 @@ import simplejson as json
 from flask import render_template, make_response, request, jsonify
 from flask_babel import gettext
 
-import pgadmin.browser.server_groups.servers.databases as databases
+from pgadmin.browser.server_groups.servers import databases
 from config import PG_DEFAULT_DRIVER
 from pgadmin.browser.server_groups.servers.databases.schemas.utils import \
     SchemaChildModule, DataTypeReader
@@ -53,7 +53,7 @@ class DomainModule(SchemaChildModule):
     _COLLECTION_LABEL = gettext("Domains")
 
     def __init__(self, *args, **kwargs):
-        super(DomainModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.min_ver = None
         self.max_ver = None
 
@@ -78,7 +78,7 @@ class DomainModule(SchemaChildModule):
         """
         from .domain_constraints import blueprint as module
         self.submodules.append(module)
-        super(DomainModule, self).register(app, options)
+        super().register(app, options)
 
 
 blueprint = DomainModule(__name__)

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

@@ -16,8 +16,7 @@ import simplejson as json
 from flask import render_template, request, jsonify
 from flask_babel import gettext
 
-import pgadmin.browser.server_groups.servers.databases.schemas.domains \
-    as domains
+from pgadmin.browser.server_groups.servers.databases.schemas import domains
 from config import PG_DEFAULT_DRIVER
 from pgadmin.browser.collection import CollectionNodeModule
 from pgadmin.browser.utils import PGChildNodeView
@@ -52,7 +51,7 @@ class DomainConstraintModule(CollectionNodeModule):
     _COLLECTION_LABEL = gettext("Domain Constraints")
 
     def __init__(self, *args, **kwargs):
-        super(DomainConstraintModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.min_ver = None
         self.max_ver = None
 

web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py

@@ -26,7 +26,7 @@ class DomainDeleteMultipleTestCase(BaseTestGenerator):
                                          domain_utils.test_cases)
 
     def setUp(self):
-        super(DomainDeleteMultipleTestCase, self).setUp()
+        super().setUp()
         self.database_info = parent_node_dict["database"][-1]
         self.db_id = self.database_info["db_id"]
         self.server_id = self.database_info["server_id"]

web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_dependent_dependency.py

@@ -25,7 +25,7 @@ class DomainGetDependentsAndDependencyTestCase(BaseTestGenerator):
                                          domain_utils.test_cases)
 
     def setUp(self):
-        super(DomainGetDependentsAndDependencyTestCase, self).setUp()
+        super().setUp()
         self.db_name = parent_node_dict["database"][-1]["db_name"]
         schema_info = parent_node_dict["schema"][-1]
         self.server_id = schema_info["server_id"]

web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_collations.py

@@ -27,7 +27,7 @@ class DomainGetCollationsTestCase(BaseTestGenerator):
                                          domain_utils.test_cases)
 
     def setUp(self):
-        super(DomainGetCollationsTestCase, self).setUp()
+        super().setUp()
         self.db_name = parent_node_dict["database"][-1]["db_name"]
         schema_info = parent_node_dict["schema"][-1]
         self.server_id = schema_info["server_id"]

web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_node.py

@@ -26,7 +26,7 @@ class DomainGetNodeTestCase(BaseTestGenerator):
                                          domain_utils.test_cases)
 
     def setUp(self):
-        super(DomainGetNodeTestCase, self).setUp()
+        super().setUp()
         self.db_name = parent_node_dict["database"][-1]["db_name"]
         schema_info = parent_node_dict["schema"][-1]
         self.server_id = schema_info["server_id"]

web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_types_func.py

@@ -32,7 +32,7 @@ class DomainGetTypesTestCase(BaseTestGenerator):
                                          domain_utils.test_cases)
 
     def setUp(self):
-        super(DomainGetTypesTestCase, self).setUp()
+        super().setUp()
         self.db_name = parent_node_dict["database"][-1]["db_name"]
         schema_info = parent_node_dict["schema"][-1]
         self.server_id = schema_info["server_id"]

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

@@ -18,7 +18,7 @@ from flask import render_template, make_response, request, jsonify, \
     current_app
 from flask_babel import gettext
 
-import pgadmin.browser.server_groups.servers.databases as databases
+from pgadmin.browser.server_groups.servers import databases
 from config import PG_DEFAULT_DRIVER
 from pgadmin.browser.server_groups.servers.databases.schemas.utils import \
     SchemaChildModule, DataTypeReader
@@ -60,7 +60,7 @@ class ForeignTableModule(SchemaChildModule):
     _COLLECTION_LABEL = gettext("Foreign Tables")
 
     def __init__(self, *args, **kwargs):
-        super(ForeignTableModule, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.min_ver = None
         self.max_ver = None
 

web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py

@@ -37,7 +37,7 @@ class ForeignTableAddTestCase(BaseTestGenerator):
     def setUp(self):
         """ This function will create foreign data wrapper and
         foreign server. """
-        super(ForeignTableAddTestCase, self).setUp()
+        super().setUp()
 
         # Load test data
         self.data = self.test_data

web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py

@@ -37,7 +37,7 @@ class ForeignTableDeleteTestCase(BaseTestGenerator):
     def setUp(self):
         """ This function will create foreign data wrapper, foreign server
         and foreign table. """
-        super(ForeignTableDeleteTestCase, self).setUp()
+        super().setUp()
 
         # Load test data
         self.data = self.test_data

web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_dependencies_dependents.py

@@ -37,7 +37,7 @@ class ForeignTableDependenciesDependentsTestCase(BaseTestGenerator):
     def setUp(self):
         """ This function will create foreign data wrapper, foreign server
         and foreign table. """
-        super(ForeignTableDependenciesDependentsTestCase, self).setUp()
+        super().setUp()
 
         # Load test data
         self.data = self.test_data

web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py

@@ -37,7 +37,7 @@ class ForeignTableGetTestCase(BaseTestGenerator):
     def setUp(self):
         """ This function will create foreign data wrapper, foreign server
         and foreign table. """
-        super(ForeignTableGetTestCase, self).setUp()
+        super().setUp()
 
         # Load test data
         self.data = self.test_data