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

web/pgadmin/tools/__init__.py

@@ -26,7 +26,7 @@ class ToolsModule(PgAdminModule):
         Override the default register function to automagically register
         sub-modules at once.
         """
-        super(PgAdminModule, self).register(app, options)
+        super().register(app, options)
 
         from .backup import blueprint as module
         app.register_blueprint(module)

web/pgadmin/tools/backup/__init__.py

@@ -34,7 +34,7 @@ server_info = {}
 
 class BackupModule(PgAdminModule):
     """
-    class BackupModule(Object):
+    class BackupModule():
 
         It is a utility which inherits PgAdminModule
         class and define methods to load its own
@@ -64,7 +64,7 @@ blueprint = BackupModule(
 )
 
 
-class BACKUP(object):
+class BACKUP():
     """
     Constants defined for Backup utilities
     """

web/pgadmin/tools/backup/tests/test_backup_create_job_unit_test.py

@@ -12,7 +12,7 @@ import os
 
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
-from pgadmin.utils import server_utils as server_utils, does_utility_exist
+from pgadmin.utils import server_utils, does_utility_exist
 from pgadmin.browser.server_groups.servers.databases.tests import utils as \
     database_utils
 from unittest.mock import patch, MagicMock

web/pgadmin/tools/debugger/tests/test_close_debugger.py

@@ -27,7 +27,7 @@ class CloseDebugger(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(CloseDebugger, 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/tools/debugger/tests/test_debugger_clear_all_breakpoint.py

@@ -27,7 +27,7 @@ class DebuggerClearAllBreakpoint(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(DebuggerClearAllBreakpoint, 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/tools/debugger/tests/test_debugger_clear_arguments.py

@@ -27,7 +27,7 @@ class DebuggerClearArguments(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(DebuggerClearArguments, 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/tools/debugger/tests/test_debugger_direct.py

@@ -27,7 +27,7 @@ class DebuggerDirect(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(DebuggerDirect, 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/tools/debugger/tests/test_debugger_execute_query.py

@@ -27,7 +27,7 @@ class DebuggerExecuteQuery(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(DebuggerExecuteQuery, 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/tools/debugger/tests/test_debugger_get_arguments.py

@@ -27,7 +27,7 @@ class DebuggerGetArguments(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(DebuggerGetArguments, 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/tools/debugger/tests/test_debugger_poll_execution_result.py

@@ -27,7 +27,7 @@ class DebuggerPollExecutionResult(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(DebuggerPollExecutionResult, 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/tools/debugger/tests/test_debugger_poll_result.py

@@ -27,7 +27,7 @@ class DebuggerPollResult(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(DebuggerPollResult, 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/tools/debugger/tests/test_debugger_set_arguments.py

@@ -27,7 +27,7 @@ class DebuggerSetArguments(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(DebuggerSetArguments, 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/tools/debugger/tests/test_debugger_set_breakpoint.py

@@ -27,7 +27,7 @@ class DebuggerSetBreakpoint(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(DebuggerSetBreakpoint, 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/tools/debugger/tests/test_init_debugger_function.py

@@ -27,7 +27,7 @@ class InitDebugger(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(InitDebugger, 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/tools/debugger/tests/test_init_debugger_trigger.py

@@ -32,7 +32,7 @@ class InitDebugger(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(InitDebugger, 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/tools/debugger/tests/test_init_target.py

@@ -31,7 +31,7 @@ class InitTargetDebugger(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(InitTargetDebugger, self).setUp()
+        super().setUp()
         self.debugger_error = 'The debugger plugin is not enabled. ' \
                               'Please add the plugin to the shared_preload_' \
                               'libraries setting in the postgresql.conf file' \

web/pgadmin/tools/debugger/tests/test_messages_debugger.py

@@ -27,7 +27,7 @@ class DebuggerMessages(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(DebuggerMessages, 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/tools/debugger/tests/test_restart_debugger.py

@@ -27,7 +27,7 @@ class RestartDebugger(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(RestartDebugger, 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/tools/debugger/tests/test_start_execution_debugger.py

@@ -27,7 +27,7 @@ class DebuggerStartExecution(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(DebuggerStartExecution, 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/tools/debugger/tests/test_start_listener_debugger.py

@@ -27,7 +27,7 @@ class DebuggerStartListener(BaseTestGenerator):
                                          debugger_utils.test_cases)
 
     def setUp(self):
-        super(DebuggerStartListener, 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/tools/debugger/utils/debugger_instance.py

@@ -14,7 +14,7 @@ import secrets
 debugger_sessions_lock = Lock()
 
 
-class DebuggerInstance(object):
+class DebuggerInstance():
     def __init__(self, trans_id=None):
         if trans_id is None:
             self._trans_id = str(secrets.choice(range(1, 9999999)))

web/pgadmin/tools/erd/tests/test_tables.py

@@ -36,7 +36,7 @@ class ERDTables(BaseSocketTestGenerator):
         utils.drop_database(connection, self.db_name)
 
     def setUp(self):
-        super(ERDTables, self).setUp()
+        super().setUp()
         self.db_name = "erdtestdb_{0}".format(str(uuid.uuid4())[1:8])
         self.sid = parent_node_dict["server"][-1]["server_id"]
         self.did = utils.create_database(self.server, self.db_name)
@@ -87,5 +87,5 @@ class ERDTables(BaseSocketTestGenerator):
                                        for tab in response_data])
 
     def tearDown(self):
-        super(ERDTables, self).tearDown()
+        super().tearDown()
         self.dropDB()

web/pgadmin/tools/erd/utils.py

@@ -18,7 +18,7 @@ from pgadmin.utils.preferences import Preferences
 
 class ERDTableView(BaseTableView, DataTypeReader):
     def __init__(self):
-        super(BaseTableView, self).__init__(cmd='erd')
+        super().__init__(cmd='erd')
 
     @BaseTableView.check_precondition
     def sql(self, conn_id=None, did=None, sid=None, data={}, with_drop=False):

web/pgadmin/tools/grant_wizard/__init__.py

@@ -35,7 +35,7 @@ server_info = {}
 
 class GrantWizardModule(PgAdminModule):
     """
-    class GrantWizardModule(Object):
+    class GrantWizardModule():
 
         It is a wizard which inherits PgAdminModule
         class and define methods to load its own

web/pgadmin/tools/import_export/tests/test_import_export_create_job_unit_test.py

@@ -12,7 +12,7 @@ import os
 
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
-from pgadmin.utils import server_utils as server_utils, does_utility_exist
+from pgadmin.utils import server_utils, does_utility_exist
 from pgadmin.browser.server_groups.servers.databases.tests import utils as \
     database_utils
 from unittest.mock import patch, MagicMock

web/pgadmin/tools/maintenance/tests/test_maintenance_create_job_unit_test.py

@@ -12,7 +12,7 @@ import simplejson as json
 
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
-from pgadmin.utils import server_utils as server_utils, does_utility_exist
+from pgadmin.utils import server_utils, does_utility_exist
 from pgadmin.browser.server_groups.servers.databases.tests import utils as \
     database_utils
 from unittest.mock import patch, MagicMock

web/pgadmin/tools/psql/__init__.py

@@ -12,7 +12,7 @@ import select
 import struct
 import config
 from sys import platform as _platform
-import eventlet.green.subprocess as subprocess
+from eventlet.green import subprocess
 from config import PG_DEFAULT_DRIVER
 from flask import Response, request
 from flask import render_template, copy_current_request_context, \

web/pgadmin/tools/psql/tests/test_backend_task.py

@@ -5,7 +5,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression.python_test_utils import test_utils as utils
 from regression import parent_node_dict
 from regression.test_setup import config_data
-from pgadmin.utils import server_utils as server_utils
+from pgadmin.utils import server_utils
 from pgAdmin4 import app
 from . import utils as psql_utils
 from .... import socketio

web/pgadmin/tools/psql/tests/test_psql_input.py

@@ -5,7 +5,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression.python_test_utils import test_utils as utils
 from regression import parent_node_dict
 from regression.test_setup import config_data
-from pgadmin.utils import server_utils as server_utils
+from pgadmin.utils import server_utils
 from pgAdmin4 import app
 from . import utils as psql_utils
 from .... import socketio

web/pgadmin/tools/psql/tests/test_resize_terminal.py

@@ -5,7 +5,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression.python_test_utils import test_utils as utils
 from regression import parent_node_dict
 from regression.test_setup import config_data
-from pgadmin.utils import server_utils as server_utils
+from pgadmin.utils import server_utils
 from pgAdmin4 import app
 from . import utils as psql_utils
 from .... import socketio

web/pgadmin/tools/psql/tests/test_start_process.py

@@ -5,7 +5,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression.python_test_utils import test_utils as utils
 from regression import parent_node_dict
 from regression.test_setup import config_data
-from pgadmin.utils import server_utils as server_utils
+from pgadmin.utils import server_utils
 from pgAdmin4 import app
 from .... import socketio
 

web/pgadmin/tools/restore/__init__.py

@@ -32,7 +32,7 @@ server_info = {}
 
 class RestoreModule(PgAdminModule):
     """
-    class RestoreModule(Object):
+    class RestoreModule():
 
         It is a utility which inherits PgAdminModule
         class and define methods to load its own

web/pgadmin/tools/restore/tests/test_create_restore_job.py

@@ -16,7 +16,7 @@ import simplejson as json
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
-from pgadmin.utils import server_utils as server_utils, does_utility_exist
+from pgadmin.utils import server_utils, does_utility_exist
 import pgadmin.tools.backup.tests.test_backup_utils as backup_utils
 
 

web/pgadmin/tools/restore/tests/test_restore_create_job_unit_test.py

@@ -12,7 +12,7 @@ import os
 
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
-from pgadmin.utils import server_utils as server_utils, does_utility_exist
+from pgadmin.utils import server_utils, does_utility_exist
 from pgadmin.browser.server_groups.servers.databases.tests import utils as \
     database_utils
 from unittest.mock import patch, MagicMock

web/pgadmin/tools/schema_diff/model.py

@@ -10,7 +10,7 @@
 from flask_babel import gettext
 
 
-class SchemaDiffModel(object):
+class SchemaDiffModel():
     """
     SchemaDiffModel
     """

web/pgadmin/tools/schema_diff/node_registry.py

@@ -8,7 +8,7 @@
 ##########################################################################
 
 
-class SchemaDiffRegistry(object):
+class SchemaDiffRegistry():
     """
     SchemaDiffRegistry
 

web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py

@@ -30,7 +30,7 @@ class SchemaDiffTestCase(BaseSocketTestGenerator):
     SOCKET_NAMESPACE = '/schema_diff'
 
     def setUp(self):
-        super(SchemaDiffTestCase, self).setUp()
+        super().setUp()
         self.src_database = "db_schema_diff_src_%s" % str(uuid.uuid4())[1:8]
         self.tar_database = "db_schema_diff_tar_%s" % str(uuid.uuid4())[1:8]
 
@@ -205,7 +205,7 @@ class SchemaDiffTestCase(BaseSocketTestGenerator):
 
     def tearDown(self):
         """This function drop the added database"""
-        super(SchemaDiffTestCase, self).tearDown()
+        super().tearDown()
         connection = utils.get_db_connection(self.server['db'],
                                              self.server['username'],
                                              self.server['db_password'],

web/pgadmin/tools/sqleditor/command.py

@@ -75,7 +75,7 @@ class ObjectRegistry(ABCMeta):
         )
 
 
-class BaseCommand(object, metaclass=ObjectRegistry):
+class BaseCommand(metaclass=ObjectRegistry):
     """
     class BaseCommand
 
@@ -125,7 +125,7 @@ class BaseCommand(object, metaclass=ObjectRegistry):
         pass
 
 
-class SQLFilter(object):
+class SQLFilter():
     """
     class SQLFilter
 
@@ -159,9 +159,9 @@ class SQLFilter(object):
             **kwargs : N number of parameters
         """
         # Save the server id and database id, namespace id, object id
-        assert ('sid' in kwargs)
-        assert ('did' in kwargs)
-        assert ('obj_id' in kwargs)
+        assert 'sid' in kwargs
+        assert 'did' in kwargs
+        assert 'obj_id' in kwargs
 
         self.sid = kwargs['sid']
         self.did = kwargs['did']
@@ -305,7 +305,7 @@ class SQLFilter(object):
         return status, result
 
 
-class FetchedRowTracker(object):
+class FetchedRowTracker():
     """
     Keeps track of fetched row count.
     """
@@ -322,7 +322,7 @@ class FetchedRowTracker(object):
 
 class GridCommand(BaseCommand, SQLFilter, FetchedRowTracker):
     """
-    class GridCommand(object)
+    class GridCommand()
 
         It is a base class for different object type used by data grid.
         A different object type must implement this to expose abstract methods.
@@ -458,7 +458,7 @@ class TableCommand(GridCommand):
         """
 
         # call base class init to fetch the table name
-        super(TableCommand, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         # Set the default sorting on table data by primary key if user
         # preference value is set
@@ -703,7 +703,7 @@ class ViewCommand(GridCommand):
         """
 
         # call base class init to fetch the table name
-        super(ViewCommand, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def get_sql(self, default_conn=None):
         """
@@ -764,7 +764,7 @@ class ForeignTableCommand(GridCommand):
         """
 
         # call base class init to fetch the table name
-        super(ForeignTableCommand, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def get_sql(self, default_conn=None):
         """
@@ -815,7 +815,7 @@ class CatalogCommand(GridCommand):
         """
 
         # call base class init to fetch the table name
-        super(CatalogCommand, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def get_sql(self, default_conn=None):
         """

web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py

@@ -76,7 +76,7 @@ class TestExplainPlanTemplates(BaseTestGenerator):
 
 class FakeApp(Flask):
     def __init__(self):
-        super(FakeApp, self).__init__("")
+        super().__init__("")
         self.jinja_loader = ChoiceLoader([
             FileSystemLoader(
                 os.path.dirname(os.path.realpath(__file__)) + "/../templates"

web/pgadmin/tools/sqleditor/tests/test_view_data_templates.py

@@ -187,7 +187,7 @@ class TestViewDataTemplates(BaseTestGenerator):
 
 class FakeApp(Flask):
     def __init__(self):
-        super(FakeApp, self).__init__("")
+        super().__init__("")
         driver = get_driver(PG_DEFAULT_DRIVER, self)
         self.jinja_env.filters['qtLiteral'] = driver.qtLiteral
         self.jinja_env.filters['qtIdent'] = driver.qtIdent

web/pgadmin/tools/sqleditor/utils/filter_dialog.py

@@ -19,7 +19,7 @@ from pgadmin.utils.exception import ConnectionLost, SSHTunnelConnectionLost
 from pgadmin.utils.constants import ERROR_MSG_TRANS_ID_NOT_FOUND
 
 
-class FilterDialog(object):
+class FilterDialog():
     @staticmethod
     def get(*args):
         """To fetch the current sorted columns"""

web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py

@@ -16,7 +16,7 @@ TX_ID_ERROR_MSG = 'Transaction ID not found in the session.'
 FAILED_TX_MSG = 'Failed to update the data on server.'
 
 
-class MockRequest(object):
+class MockRequest():
     "To mock request object"
     def __init__(self):
         self.data = None

web/pgadmin/tools/user_management/__init__.py

@@ -35,7 +35,7 @@ server_info = {}
 
 class UserManagementModule(PgAdminModule):
     """
-    class UserManagementModule(Object):
+    class UserManagementModule():
 
         It is a utility which inherits PgAdminModule
         class and define methods to load its own