Remove Python 2 support from the Python tests.

refs #5443

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

@@ -14,12 +14,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as cast_utils
-import sys
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class CastsCreateTestCase(BaseTestGenerator):

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

@@ -14,13 +14,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as cast_utils
-
-import sys
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class CastsCreateGetFunctionsTestCase(BaseTestGenerator):

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

@@ -14,13 +14,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as cast_utils
-
-import sys
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class CastsCreateGettypeTestCase(BaseTestGenerator):

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

@@ -15,13 +15,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as cast_utils
-
-import sys
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class CastsDeleteTestCase(BaseTestGenerator):

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

@@ -8,7 +8,6 @@
 ##########################################################################
 
 from __future__ import print_function
-import json
 
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
@@ -16,13 +15,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as cast_utils
-
-import sys
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class CastsMultipleDeleteTestCase(BaseTestGenerator):

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

@@ -14,13 +14,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as cast_utils
-
-import sys
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class CastsGetTestCase(BaseTestGenerator):

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

@@ -15,12 +15,6 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as cast_utils
-import sys
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
 
 
 class CastsGetDependentsAndDependencyTestCase(BaseTestGenerator):

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

@@ -1,3 +1,12 @@
+##########################################################################
+#
+# pgAdmin 4 - PostgreSQL Tools
+#
+# Copyright (C) 2013 - 2020, The pgAdmin Development Team
+# This software is released under the PostgreSQL Licence
+#
+##########################################################################
+
 from __future__ import print_function
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
@@ -5,13 +14,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as cast_utils
-
-import sys
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class CastsGetNodeTestCase(BaseTestGenerator):

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

@@ -15,12 +15,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as cast_utils
-import sys
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class CastsGetSqlTestCase(BaseTestGenerator):

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

@@ -9,20 +9,13 @@
 
 from __future__ import print_function
 
-import json
-
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as cast_utils
-import sys
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class CastsPutTestCase(BaseTestGenerator):

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

@@ -9,8 +9,6 @@
 
 import json
 import uuid
-import sys
-
 from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
@@ -21,11 +19,7 @@ from regression import parent_node_dict
 from regression import trigger_funcs_utils
 from regression.python_test_utils import test_utils as utils
 from . import utils as event_trigger_utils
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class EventTriggerAddTestCase(BaseTestGenerator):

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

@@ -8,8 +8,6 @@
 ##########################################################################
 
 import uuid
-import sys
-
 from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
@@ -20,11 +18,7 @@ from regression import parent_node_dict
 from regression import trigger_funcs_utils
 from regression.python_test_utils import test_utils as utils
 from . import utils as event_trigger_utils
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class EventTriggerDeleteTestCase(BaseTestGenerator):

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

@@ -8,7 +8,6 @@
 ##########################################################################
 
 import uuid
-import sys
 
 from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
@@ -20,11 +19,7 @@ from regression import parent_node_dict
 from regression import trigger_funcs_utils
 from regression.python_test_utils import test_utils as utils
 from . import utils as event_trigger_utils
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class EventTriggerFunctionsTestCase(BaseTestGenerator):

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

@@ -8,7 +8,6 @@
 ##########################################################################
 
 import uuid
-import sys
 from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
@@ -19,11 +18,7 @@ from regression import parent_node_dict
 from regression import trigger_funcs_utils
 from regression.python_test_utils import test_utils as utils
 from . import utils as event_trigger_utils
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class EventTriggerGetTestCase(BaseTestGenerator):

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

@@ -9,8 +9,6 @@
 
 import json
 import uuid
-import sys
-
 from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
@@ -21,11 +19,7 @@ from regression import parent_node_dict
 from regression import trigger_funcs_utils
 from regression.python_test_utils import test_utils as utils
 from . import utils as event_trigger_utils
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class EventTriggerPutTestCase(BaseTestGenerator):

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

@@ -8,7 +8,6 @@
 ##########################################################################
 
 import uuid
-import sys
 from pgadmin.browser.server_groups.servers.databases.schemas.tests import \
     utils as schema_utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
@@ -19,11 +18,7 @@ from regression import parent_node_dict
 from regression import trigger_funcs_utils
 from regression.python_test_utils import test_utils as utils
 from . import utils as event_trigger_utils
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class EventTriggerGetSqlTestCase(BaseTestGenerator):

web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py

@@ -7,18 +7,12 @@
 #
 ##########################################################################
 
-import sys
-
 import six
 
 from pgadmin.browser.server_groups.servers\
     .databases.external_tables import ExternalTablesModule
 from pgadmin.utils.route import BaseTestGenerator
-
-if sys.version_info < (3, 3):
-    from mock import MagicMock, Mock
-else:
-    from unittest.mock import MagicMock, Mock
+from unittest.mock import MagicMock, Mock
 
 
 class TestExternalTablesModule(BaseTestGenerator):

web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py

@@ -8,16 +8,11 @@
 ##########################################################################
 
 import os
-import sys
 
 from pgadmin.browser.server_groups.servers.databases.external_tables import \
     ExternalTablesView
 from pgadmin.utils.route import BaseTestGenerator
-
-if sys.version_info < (3, 3):
-    from mock import MagicMock, patch
-else:
-    from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 
 class TestExternalTablesView(BaseTestGenerator):

web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py

@@ -6,18 +6,13 @@
 # This software is released under the PostgreSQL Licence
 #
 ##########################################################################
-import sys
 
 from pgadmin.browser.server_groups.servers.databases \
     .external_tables import Properties
 from pgadmin.browser.server_groups.servers.databases.external_tables \
     .properties import PropertiesException, PropertiesTableNotFoundException
 from pgadmin.utils.route import BaseTestGenerator
-
-if sys.version_info < (3, 3):
-    from mock import MagicMock, patch
-else:
-    from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 
 class TestProperties(BaseTestGenerator):

web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_reverse_engineer_ddl.py

@@ -7,17 +7,11 @@
 #
 ##########################################################################
 
-import sys
-
 from pgadmin.browser.server_groups.servers.databases \
     .external_tables.reverse_engineer_ddl import \
     ReverseEngineerDDL, ReverseEngineerDDLException
 from pgadmin.utils.route import BaseTestGenerator
-
-if sys.version_info < (3, 3):
-    from mock import MagicMock
-else:
-    from unittest.mock import MagicMock
+from unittest.mock import MagicMock
 
 
 class TestReverseEngineerDDL(BaseTestGenerator):

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

@@ -11,7 +11,6 @@ from __future__ import print_function
 
 import json
 import uuid
-import sys
 
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
@@ -19,11 +18,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as language_utils
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class LanguagesAddTestCase(BaseTestGenerator):

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

@@ -8,7 +8,6 @@
 ##########################################################################
 
 from __future__ import print_function
-import sys
 import uuid
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
@@ -16,11 +15,7 @@ from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as language_utils
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class LanguagesDeleteTestCase(BaseTestGenerator):

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

@@ -10,18 +10,13 @@
 from __future__ import print_function
 
 import uuid
-import sys
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from regression.python_test_utils import test_utils as utils
 from . import utils as language_utils
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class LanguagesGetTestCase(BaseTestGenerator):

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

@@ -10,18 +10,13 @@
 from __future__ import print_function
 
 import uuid
-import sys
 from . import utils as language_utils
 from regression.python_test_utils import test_utils as utils
 from regression import parent_node_dict
 from pgadmin.utils.route import BaseTestGenerator
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class LanguagesGetFunctionAndTemplateTestCase(BaseTestGenerator):

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

@@ -11,18 +11,13 @@ from __future__ import print_function
 
 import json
 import uuid
-import sys
 from regression.python_test_utils import test_utils as utils
 from pgadmin.utils.route import BaseTestGenerator
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
 from regression import parent_node_dict
 from . import utils as language_utils
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class LanguagesPutTestCase(BaseTestGenerator):

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

@@ -10,18 +10,13 @@
 from __future__ import print_function
 
 import uuid
-import sys
 from pgadmin.utils.route import BaseTestGenerator
 from regression import parent_node_dict
 from . import utils as language_utils
 from regression.python_test_utils import test_utils as utils
 from pgadmin.browser.server_groups.servers.databases.tests import \
     utils as database_utils
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class LanguagesGetSql(BaseTestGenerator):

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

@@ -7,16 +7,10 @@
 #
 ##########################################################################
 
-import sys
-
 from pgadmin.browser.server_groups.servers.databases.schemas.tables.\
     partitions import PartitionsModule
 from pgadmin.utils.route import BaseTestGenerator
-
-if sys.version_info < (3, 3):
-    from mock import patch, Mock, call
-else:
-    from unittest.mock import patch, Mock, call
+from unittest.mock import patch, Mock, call
 
 
 class TestBackendSupport(BaseTestGenerator):

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py

@@ -8,8 +8,6 @@
 ##########################################################################
 
 import os
-import sys
-
 from pgadmin.utils.driver import DriverRegistry
 from regression.python_test_utils.template_helper import file_as_template
 
@@ -17,9 +15,6 @@ DriverRegistry.load_drivers()
 from pgadmin.utils.route import BaseTestGenerator
 from regression.python_test_utils import test_utils
 
-if sys.version_info[0] >= 3:
-    long = int
-
 
 class TestColumnForeignKeyGetConstraintCols(BaseTestGenerator):
     scenarios = [

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_node_sql.py

@@ -8,15 +8,10 @@
 ##########################################################################
 
 import os
-import sys
-
 from regression.python_test_utils.sql_template_test_base import \
     SQLTemplateTestBase
 from regression.python_test_utils.template_helper import file_as_template
 
-if sys.version_info[0] >= 3:
-    long = int
-
 
 class TestTablesNodeSql(SQLTemplateTestBase):
     scenarios = [
@@ -48,8 +43,8 @@ class TestTablesNodeSql(SQLTemplateTestBase):
         triggercount = first_row['triggercount']
         has_enable_triggers = first_row['has_enable_triggers']
 
-        self.assertIsNotNone(long(oid))
+        self.assertIsNotNone(int(oid))
         self.assertEqual('test_table', name)
         # triggercount is sometimes returned as a string for some reason
-        self.assertEqual(0, long(triggercount))
-        self.assertIsNotNone(long(has_enable_triggers))
+        self.assertEqual(0, int(triggercount))
+        self.assertIsNotNone(int(has_enable_triggers))

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py

@@ -8,17 +8,11 @@
 ##########################################################################
 
 import os
-import sys
-
 from regression.python_test_utils.template_helper import file_as_template
 from regression.python_test_utils.sql_template_test_base import \
     SQLTemplateTestBase
 
 
-if sys.version_info[0] >= 3:
-    long = int
-
-
 class TestTablesPropertiesSql(SQLTemplateTestBase):
     scenarios = [
         ("This scenario tests that all applicable sql template versions can "
@@ -39,7 +33,7 @@ class TestTablesPropertiesSql(SQLTemplateTestBase):
 
         self.assertEqual('test_table', first_row['name'])
         # triggercount is sometimes returned as a string for some reason
-        self.assertEqual(0, long(first_row['triggercount']))
+        self.assertEqual(0, int(first_row['triggercount']))
         self.assertEqual(None, first_row['typname'])
         self.assertEqual([], first_row['coll_inherits'])
 

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py

@@ -6,15 +6,11 @@
 # This software is released under the PostgreSQL Licence
 #
 ##########################################################################
-import sys
+
 from pgadmin.browser.server_groups.servers.databases.schemas.tables import \
     BaseTableView
 from pgadmin.utils.route import BaseTestGenerator
-
-if sys.version_info < (3, 3):
-    from mock import patch, MagicMock
-else:
-    from unittest.mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 
 class TestBaseView(BaseTableView):

web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_utils.py

@@ -7,16 +7,10 @@
 #
 ##########################################################################
 
-import sys
-
 from pgadmin.browser.server_groups.servers.databases.schemas.utils import \
     DataTypeReader
 from pgadmin.utils.route import BaseTestGenerator
-
-if sys.version_info < (3, 3):
-    from mock import patch, Mock
-else:
-    from unittest.mock import patch, Mock
+from unittest.mock import patch, Mock
 
 _default_database_response = [
     {

web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py

@@ -6,13 +6,8 @@
 # This software is released under the PostgreSQL Licence
 #
 ##########################################################################
-import sys
-
-if sys.version_info < (3, 3):
-    from mock import MagicMock
-else:
-    from unittest.mock import MagicMock
 
+from unittest.mock import MagicMock
 from pgadmin.browser.server_groups.servers.tablespaces import TablespaceModule
 from pgadmin.utils.route import BaseTestGenerator
 

web/pgadmin/browser/tests/test_ldap_with_mocking.py

@@ -7,17 +7,12 @@
 #
 ##########################################################################
 
-import sys
 import config as app_config
 from pgadmin.utils.route import BaseTestGenerator
 from regression.python_test_utils import test_utils as utils
 from regression.test_setup import config_data
 from pgadmin.authenticate.registry import AuthSourceRegistry
-
-if sys.version_info < (3, 3):
-    from mock import patch
-else:
-    from unittest.mock import patch
+from unittest.mock import patch
 
 
 class LDAPLoginMockTestCase(BaseTestGenerator):