From f93cfe8c4cb94fffbc4d273f196a8f06e83c4bb8 Mon Sep 17 00:00:00 2001 From: Cyril Jouve Date: Mon, 27 Jul 2020 11:03:13 +0100 Subject: [PATCH] Remove old Python 2 compatibility code. Fixes #5700 --- docs/en_US/release_notes_4_25.rst | 1 + tools/copyright_updater.py | 1 - tools/get_chromedriver.py | 8 ++----- tools/sql_keywords.py | 1 - web/migrations/env.py | 1 - web/pgadmin/browser/__init__.py | 10 +++----- .../databases/casts/tests/test_cast_create.py | 1 - .../tests/test_cast_create_get_functions.py | 1 - .../casts/tests/test_cast_create_get_type.py | 1 - .../databases/casts/tests/test_cast_delete.py | 1 - .../casts/tests/test_cast_delete_multiple.py | 1 - .../databases/casts/tests/test_cast_get.py | 1 - .../test_cast_get_dependencies_dependent.py | 1 - .../casts/tests/test_cast_get_node.py | 1 - .../casts/tests/test_cast_get_sql.py | 1 - .../databases/casts/tests/test_cast_put.py | 1 - .../servers/databases/casts/tests/utils.py | 1 - .../databases/event_triggers/tests/utils.py | 1 - .../extensions/tests/test_extension_add.py | 1 - .../extensions/tests/test_extension_delete.py | 1 - .../tests/test_extension_delete_multiple.py | 1 - .../extensions/tests/test_extension_get.py | 1 - .../extensions/tests/test_extension_put.py | 1 - .../databases/extensions/tests/utils.py | 1 - .../tests/test_external_tables_module.py | 4 +--- .../tests/test_foreign_servers_add.py | 1 - .../tests/test_foreign_servers_delete.py | 1 - .../test_foreign_servers_delete_multiple.py | 1 - ...st_foreign_servers_dependent_dependency.py | 1 - .../tests/test_foreign_servers_get.py | 1 - .../tests/test_foreign_servers_msql.py | 1 - .../tests/test_foreign_servers_node.py | 1 - .../tests/test_foreign_servers_put.py | 1 - .../tests/test_foreign_servers_sql.py | 1 - .../foreign_servers/tests/utils.py | 1 - .../tests/test_user_mapping_add.py | 1 - .../tests/test_user_mapping_delete.py | 1 - .../test_user_mapping_delete_multiple.py | 1 - .../test_user_mapping_dependent_dependency.py | 1 - .../tests/test_user_mapping_get.py | 1 - .../tests/test_user_mapping_msql.py | 1 - .../tests/test_user_mapping_node.py | 1 - .../tests/test_user_mapping_put.py | 1 - .../tests/test_user_mapping_sql.py | 1 - .../user_mappings/tests/utils.py | 1 - .../tests/test_fdw_add.py | 1 - .../tests/test_fdw_delete.py | 1 - .../tests/test_fdw_delete_multiple.py | 1 - .../tests/test_fdw_dependency_dependent.py | 1 - .../tests/test_fdw_get-handlers.py | 1 - .../tests/test_fdw_get.py | 1 - .../tests/test_fdw_get_nodes.py | 1 - .../tests/test_fdw_get_validators.py | 1 - .../tests/test_fdw_msql.py | 1 - .../tests/test_fdw_put.py | 1 - .../tests/test_fdw_sql.py | 1 - .../foreign_data_wrappers/tests/utils.py | 1 - .../languages/tests/test_language_add.py | 1 - .../languages/tests/test_language_delete.py | 1 - .../tests/test_language_delete_multiple.py | 1 - .../tests/test_language_dependency.py | 1 - .../tests/test_language_dependent.py | 1 - .../languages/tests/test_language_get.py | 1 - ...test_language_get_function_and_template.py | 1 - .../languages/tests/test_language_put.py | 1 - .../languages/tests/test_language_sql.py | 1 - .../databases/languages/tests/utils.py | 1 - .../schemas/collations/tests/utils.py | 1 - .../domains/domain_constraints/tests/utils.py | 1 - .../databases/schemas/domains/tests/utils.py | 1 - .../tests/test_foreign_table_add.py | 1 - .../tests/test_foreign_table_delete.py | 1 - .../test_foreign_table_delete_multiple.py | 1 - .../tests/test_foreign_table_get.py | 1 - .../tests/test_foreign_table_put.py | 1 - .../schemas/foreign_tables/tests/utils.py | 1 - .../tests/test_fts_configuration_add.py | 1 - .../test_fts_configuration_copyConfig.py | 1 - .../tests/test_fts_configuration_delete.py | 1 - .../test_fts_configuration_delete_multiple.py | 1 - ..._fts_configuration_dependency_dependent.py | 1 - .../tests/test_fts_configuration_get.py | 1 - ...test_fts_configuration_get_dictionaries.py | 1 - .../tests/test_fts_configuration_get_nodes.py | 1 - .../tests/test_fts_configuration_get_sql.py | 1 - .../tests/test_fts_configuration_parsers.py | 1 - .../tests/test_fts_configuration_put.py | 1 - .../tests/test_fts_configuration_tokens.py | 1 - .../schemas/fts_configurations/tests/utils.py | 1 - .../tests/test_fts_dictionaries_add.py | 1 - .../tests/test_fts_dictionaries_delete.py | 1 - .../test_fts_dictionaries_delete_multiple.py | 1 - ...t_fts_dictionaries_dependency_dependent.py | 1 - .../test_fts_dictionaries_fetch_templates.py | 1 - .../tests/test_fts_dictionaries_get.py | 1 - .../tests/test_fts_dictionaries_get_nodes.py | 1 - .../tests/test_fts_dictionaries_put.py | 1 - .../schemas/fts_dictionaries/tests/utils.py | 1 - .../fts_parsers/tests/test_fts_parser_add.py | 1 - .../tests/test_fts_parser_delete.py | 1 - .../tests/test_fts_parser_delete_multiple.py | 1 - .../test_fts_parser_dependency_dependent.py | 1 - .../tests/test_fts_parser_end_functions.py | 1 - .../fts_parsers/tests/test_fts_parser_get.py | 1 - .../tests/test_fts_parser_get_nodes.py | 1 - .../test_fts_parser_head_line_functions.py | 1 - .../test_fts_parser_lextype_functions.py | 1 - .../fts_parsers/tests/test_fts_parser_put.py | 1 - .../tests/test_fts_parser_start_functions.py | 1 - .../tests/test_fts_parser_token_functions.py | 1 - .../schemas/fts_parsers/tests/utils.py | 1 - .../test_fts_template_dependency_dependent.py | 1 - .../tests/test_fts_template_get_init.py | 1 - .../tests/test_fts_template_get_lexize.py | 1 - .../tests/test_fts_template_get_nodes.py | 1 - .../tests/test_fts_templates_add.py | 1 - .../tests/test_fts_templates_delete.py | 1 - .../test_fts_templates_delete_multiple.py | 1 - .../tests/test_fts_templates_get.py | 1 - .../tests/test_fts_templates_put.py | 1 - .../schemas/fts_templates/tests/utils.py | 1 - .../schemas/functions/tests/utils.py | 1 - .../databases/schemas/packages/tests/utils.py | 1 - .../schemas/sequences/tests/utils.py | 1 - .../databases/schemas/synonyms/tests/utils.py | 1 - .../tables/columns/tests/test_column_msql.py | 6 +---- .../schemas/tables/columns/tests/utils.py | 1 - .../tests/test_compound_triggers_add.py | 6 +---- .../tests/test_compound_triggers_delete.py | 6 +---- .../test_compound_triggers_delete_multiple.py | 6 +---- .../tests/test_compound_triggers_get.py | 6 +---- .../tests/test_compound_triggers_put.py | 6 +---- .../tables/compound_triggers/tests/utils.py | 1 - .../check_constraint/tests/utils.py | 1 - .../exclusion_constraint/tests/utils.py | 1 - .../constraints/foreign_key/tests/utils.py | 1 - .../index_constraint/tests/utils.py | 1 - .../schemas/tables/indexes/tests/utils.py | 1 - .../tests/test_rls_add.py | 7 ++---- .../tests/test_rls_delete.py | 6 +---- .../tests/test_rls_get.py | 6 +---- .../tests/test_rls_put.py | 6 +---- .../row_security_policies/tests/utils.py | 1 - .../tables/rules/tests/test_rules_add.py | 7 ++---- .../tables/rules/tests/test_rules_delete.py | 6 +---- .../tables/rules/tests/test_rules_get.py | 6 +---- .../tables/rules/tests/test_rules_put.py | 5 +--- .../schemas/tables/rules/tests/utils.py | 1 - .../databases/schemas/tables/tests/utils.py | 1 - .../triggers/tests/test_triggers_add.py | 6 +---- .../triggers/tests/test_triggers_delete.py | 6 +---- .../triggers/tests/test_triggers_get.py | 6 +---- .../triggers/tests/test_triggers_put.py | 6 +---- .../schemas/tables/triggers/tests/utils.py | 1 - .../servers/databases/schemas/tests/utils.py | 1 - .../databases/schemas/types/tests/utils.py | 1 - .../databases/schemas/views/tests/utils.py | 1 - .../servers/pgagent/tests/utils.py | 1 - .../servers/resource_groups/tests/utils.py | 1 - .../servers/roles/tests/utils.py | 1 - .../tablespaces/tests/test_tbspc_add.py | 1 - .../tablespaces/tests/test_tbspc_delete.py | 1 - .../servers/tablespaces/tests/utils.py | 1 - .../feature_tests/browser_tool_bar_test.py | 1 - ...opy_selected_query_results_feature_test.py | 1 - .../feature_tests/file_manager_test.py | 1 - .../feature_tests/keyboard_shortcut_test.py | 1 - .../pg_datatype_validation_test.py | 1 - .../pg_utilities_backup_restore_test.py | 1 - .../pg_utilities_maintenance_test.py | 1 - .../query_tool_auto_complete_tests.py | 1 - .../feature_tests/query_tool_journey_test.py | 1 - web/pgadmin/feature_tests/query_tool_tests.py | 1 - .../feature_tests/table_ddl_feature_test.py | 1 - .../feature_tests/view_data_dml_queries.py | 1 - .../xss_checks_panels_and_query_tool_test.py | 1 - .../xss_checks_pgadmin_debugger_test.py | 1 - .../xss_checks_roles_control_test.py | 1 - .../misc/bgprocess/process_executor.py | 1 - web/pgadmin/misc/bgprocess/processes.py | 3 +-- web/pgadmin/misc/file_manager/__init__.py | 15 ++---------- web/pgadmin/tools/backup/__init__.py | 1 - .../search_objects/tests/test_api_search.py | 7 +----- web/pgadmin/utils/crypto.py | 8 ++----- web/pgadmin/utils/csv.py | 24 +++++++------------ web/pgadmin/utils/driver/psycopg2/__init__.py | 15 ------------ .../utils/driver/psycopg2/connection.py | 3 +-- .../utils/driver/psycopg2/server_manager.py | 3 --- web/pgadmin/utils/server_utils.py | 1 - .../utils/sqlautocomplete/completion.py | 2 -- .../sqlautocomplete/parseutils/tables.py | 1 - .../utils/sqlautocomplete/parseutils/utils.py | 1 - .../utils/sqlautocomplete/sqlcompletion.py | 6 +---- web/regression/feature_utils/pgadmin_page.py | 1 - .../python_test_utils/test_utils.py | 5 ++-- web/regression/re_sql/tests/test_resql.py | 15 ++---------- web/regression/runtests.py | 1 - 197 files changed, 47 insertions(+), 354 deletions(-) diff --git a/docs/en_US/release_notes_4_25.rst b/docs/en_US/release_notes_4_25.rst index 5da181f5b..709765156 100644 --- a/docs/en_US/release_notes_4_25.rst +++ b/docs/en_US/release_notes_4_25.rst @@ -14,6 +14,7 @@ Housekeeping ************ | `Issue #5324 `_ - Improve code coverage and API test cases for Foreign Servers and User Mappings. +| `Issue #5700 `_ - Remove old Python 2 compatibility code. Bug fixes ********* diff --git a/tools/copyright_updater.py b/tools/copyright_updater.py index b7d99d3a2..f74b86e67 100644 --- a/tools/copyright_updater.py +++ b/tools/copyright_updater.py @@ -12,7 +12,6 @@ # This utility will allow us to change the copyright year information from # all the files present in FILE_EXTENSIONS variable at once -from __future__ import print_function import os import sys import re diff --git a/tools/get_chromedriver.py b/tools/get_chromedriver.py index 5f33136af..155fa54f7 100644 --- a/tools/get_chromedriver.py +++ b/tools/get_chromedriver.py @@ -17,12 +17,8 @@ import os import platform import subprocess import sys -try: - from urllib.request import urlopen, urlretrieve - from urllib.error import URLError -except Exception: - from urllib import urlopen, urlretrieve - URLError = Exception +from urllib.request import urlopen, urlretrieve +from urllib.error import URLError import zipfile diff --git a/tools/sql_keywords.py b/tools/sql_keywords.py index 9f1d466c2..6d4c6f1e3 100644 --- a/tools/sql_keywords.py +++ b/tools/sql_keywords.py @@ -13,7 +13,6 @@ # pgsql keywords from the code git paths mentioned in PG_CODES_URLS # Note that, PG_CODES_URLS may need to be changed manually per version change -from __future__ import print_function import re import requests import argparse diff --git a/web/migrations/env.py b/web/migrations/env.py index 15f6c3c5b..f3017eba5 100644 --- a/web/migrations/env.py +++ b/web/migrations/env.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import with_statement from alembic import context from sqlalchemy import engine_from_config, pool import logging diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py index 99c9bbec0..e0047daf5 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -15,6 +15,7 @@ from smtplib import SMTPConnectError, SMTPResponseException, \ SMTPServerDisconnected, SMTPDataError, SMTPHeloError, SMTPException, \ SMTPAuthenticationError, SMTPSenderRefused, SMTPRecipientsRefused from socket import error as SOCKETErrorException +import urllib.request as urlopen import six from flask import current_app, render_template, url_for, make_response, \ @@ -47,11 +48,6 @@ from pgadmin.utils.master_password import validate_master_password, \ set_crypt_key, process_masterpass_disabled from pgadmin.model import User -try: - import urllib.request as urlreq -except ImportError as e: - import urllib2 as urlreq - try: from flask_security.views import default_render_json except ImportError as e: @@ -608,9 +604,9 @@ def index(): # It stuck on rendering the browser.html, while working in the # broken network. if os.path.exists(config.CA_FILE): - response = urlreq.urlopen(url, data, 5, cafile=config.CA_FILE) + response = urlopen(url, data, 5, cafile=config.CA_FILE) else: - response = urlreq.urlopen(url, data, 5) + response = urlopen(url, data, 5) current_app.logger.debug( 'Version check HTTP response code: %d' % response.getcode() ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create.py index b3dcc8e14..9ef69ec28 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils from pgadmin.utils.route import BaseTestGenerator diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create_get_functions.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create_get_functions.py index 26a1190ce..099615c56 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create_get_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create_get_functions.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils from pgadmin.utils.route import BaseTestGenerator diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create_get_type.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create_get_type.py index cd08934e2..f4d7e2e26 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create_get_type.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_create_get_type.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils from pgadmin.utils.route import BaseTestGenerator diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py index 4af22f4dd..a49d6cc88 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete_multiple.py index 655c54361..d9b7e9263 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_delete_multiple.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py index bb8118f57..97b7f3acf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils from pgadmin.utils.route import BaseTestGenerator diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_dependencies_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_dependencies_dependent.py index d5f510999..346bfd9e4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_dependencies_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_dependencies_dependent.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_node.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_node.py index 7a4847e76..16b9c2f87 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_node.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_node.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils from pgadmin.utils.route import BaseTestGenerator diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_sql.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_sql.py index 6215037e9..c675cd84a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_get_sql.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py index df5878f9e..43d9e68a2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/test_cast_put.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py index 7b8c1903b..68f9da2cb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from regression.python_test_utils.test_utils import * import os import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py index 94ae931cc..853ad4218 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py index a18d4f223..af62ca486 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_add.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py index 03c897f4d..87639b539 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py index c9770eea5..a52a8d675 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_delete_multiple.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json from pgadmin.browser.server_groups.servers.databases.tests import \ diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py index baf2ae9f9..23efe5889 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_get.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py index 7f60d94db..a25870c2f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/test_extension_put.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/utils.py index b0eb66020..53d02d8f2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py index 6454bc9de..56e0ae636 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_module.py @@ -7,8 +7,6 @@ # ########################################################################## -import six - from pgadmin.browser.server_groups.servers\ .databases.external_tables import ExternalTablesModule from pgadmin.utils.route import BaseTestGenerator @@ -90,7 +88,7 @@ class TestExternalTablesModule(BaseTestGenerator): module.generate_browser_collection_node = Mock() result = module.get_nodes(**self.function_parameters) - six.next(result) + next(result) module.generate_browser_collection_node.assert_called_with( self.expected_generate_browser_collection_node_called_with diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py index 32c4edb16..3ec9a76f1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_add.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py index 7cf29a091..a7ab075d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py index 481d8efc1..fe91d8c20 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_delete_multiple.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_dependent_dependency.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_dependent_dependency.py index 0af9a3c17..383d4bef1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_dependent_dependency.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_dependent_dependency.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py index 3bec68f66..2e897bc96 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_get.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_msql.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_msql.py index a2874db28..024b7d093 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_msql.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_node.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_node.py index 884566171..186bf4dc7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_node.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_node.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py index 83ca0fc3c..23c2ec814 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_put.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_sql.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_sql.py index 59562d336..07f5dc47f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/test_foreign_servers_sql.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py index d65b382fa..7d813fcc5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os import sys diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py index bf3080ead..9cf6e2d1c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py index 56e90bc0f..2dea5ade7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py index 343fbfa47..3bf23a4f0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_dependent_dependency.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_dependent_dependency.py index 86ece52f2..f09c09d34 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_dependent_dependency.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_dependent_dependency.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py index af376de89..e555fcd03 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_msql.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_msql.py index 8b506eb10..ff1ee59c5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_msql.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_node.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_node.py index 8717b918f..4d9f830eb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_node.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_node.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py index 12a16c088..22e5ee239 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_sql.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_sql.py index f28da4822..5b43e47b0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_sql.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/utils.py index 51936f690..cc4f335d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os import sys diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py index 786293184..a6d0acc0f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_add.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py index 2c511438e..e3a0a86f2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py index 54c453f37..9080209f1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_delete_multiple.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_dependency_dependent.py index eac310867..070549ea8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_dependency_dependent.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get-handlers.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get-handlers.py index 0fa54aa8e..ba0659444 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get-handlers.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get-handlers.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py index ff4ebeae7..22272cf46 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_nodes.py index d80d5f039..b95596351 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_nodes.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_validators.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_validators.py index d251d8e99..a61e28b23 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_validators.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_get_validators.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_msql.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_msql.py index c77357405..cee903777 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_msql.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py index 93e72d2d9..e89a86f1b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_put.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_sql.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_sql.py index 2515a514e..67392fde9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/test_fdw_sql.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py index 1bf659290..46ffc2c8d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py index 44f99f8ba..d823ed6b4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py index 4654db4e3..36839b79c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from pgadmin.browser.server_groups.servers.databases.tests import \ utils as database_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py index 62c89c144..1bc308703 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_delete_multiple.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependency.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependency.py index 1c233072c..543b0f008 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependency.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependency.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependent.py index b73c6a8b1..cfcb64b23 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_dependent.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from regression import parent_node_dict diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py index 8921fdf7a..334674687 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from pgadmin.browser.server_groups.servers.databases.tests import \ diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get_function_and_template.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get_function_and_template.py index d63a8bdcc..4526d908e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get_function_and_template.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_get_function_and_template.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from . import utils as language_utils diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py index de4940530..2d45304e2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_put.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_sql.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_sql.py index 14af1a700..77caf71e0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_sql.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from pgadmin.utils.route import BaseTestGenerator diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py index f0f9b9239..27790caa1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/utils.py index d34af0237..5d0720117 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/utils.py index 140fb9e74..93a1a50e2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/utils.py index 84a9169b9..6d4a5968b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py index c989b0caa..6a01b547d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_add.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py index 9f8f84fb6..43641a54e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py index 9b3289e6e..73e18afe9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_delete_multiple.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py index 4449892e7..d8c20e9c0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_get.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_put.py index 17beda009..ae6752c73 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/test_foreign_table_put.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py index 078baceca..d659fce5e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os import sys diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_add.py index 2ca767cbc..24647349a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_add.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_copyConfig.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_copyConfig.py index a33d0df9b..3f2609001 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_copyConfig.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_copyConfig.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete.py index 64a2dff3d..0aeedd355 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py index 3afaf7b36..4facacc35 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_delete_multiple.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_dependency_dependent.py index 08a8761c5..2be915a85 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_dependency_dependent.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get.py index 52d447616..21eeb9bc9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_dictionaries.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_dictionaries.py index fbb71b4b8..391e4efbe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_dictionaries.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_dictionaries.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_nodes.py index d41af21f0..e81865e0d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_nodes.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_sql.py index 9cbf9862e..20aca7cf2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_get_sql.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_parsers.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_parsers.py index 4b90882c0..86bb8ef24 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_parsers.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_parsers.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_put.py index ffe754ef7..3b97a1a55 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_put.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_tokens.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_tokens.py index bb5bb27ff..cf13c134f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_tokens.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/test_fts_configuration_tokens.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py index 6e05cf0f5..d15227621 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os import sys diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_add.py index a3eb527ff..504817b49 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_add.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete.py index c415ef0fa..60dd87b51 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py index f8a78724e..c87b10f90 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_delete_multiple.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_dependency_dependent.py index 6ce55c5eb..0b2dea079 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_dependency_dependent.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_fetch_templates.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_fetch_templates.py index 44f64db6f..2f19db086 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_fetch_templates.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_fetch_templates.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get.py index 270385c99..ea32d2260 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get_nodes.py index 70713a9bb..afa06bf91 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_get_nodes.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_put.py index f2aa1127d..0fe1aa840 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/test_fts_dictionaries_put.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py index 8c2da7ec3..bf8c3c2ec 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os import sys diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_add.py index 350179c36..f99faf342 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_add.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete.py index 4059bdb16..18448b871 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete_multiple.py index fc32a9097..735f63bbe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_delete_multiple.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_dependency_dependent.py index 7789ac2f1..546db4601 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_dependency_dependent.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_end_functions.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_end_functions.py index 094e1a01a..508ab8762 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_end_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_end_functions.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get.py index 593b4132c..89738aaa1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get_nodes.py index 77d635898..35d101d4d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_get_nodes.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_head_line_functions.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_head_line_functions.py index 334299b12..e3bb75531 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_head_line_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_head_line_functions.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_lextype_functions.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_lextype_functions.py index f523e2109..3ca2233c8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_lextype_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_lextype_functions.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_put.py index d9e21f9c0..0f0ea3c2a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_put.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_start_functions.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_start_functions.py index 371758a5c..f8447efa8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_start_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_start_functions.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_token_functions.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_token_functions.py index c831e4f8b..e27f42150 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_token_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/test_fts_parser_token_functions.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/utils.py index 52a243c5c..582151c77 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os import sys diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_dependency_dependent.py index fa2cecddb..85da79723 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_dependency_dependent.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_init.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_init.py index 0cf99303d..45a7cab26 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_init.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_init.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_lexize.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_lexize.py index 09a838737..c4c1a7434 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_lexize.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_lexize.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_nodes.py index eca9b96f7..2cb7412a4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_template_get_nodes.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid from unittest.mock import patch diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_add.py index 0314c3f21..050a48db9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_add.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py index 8cfe3a055..b49c27327 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py index 0f61ef9b9..e09569a68 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_delete_multiple.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid import json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_get.py index e741bda9a..e49beba5b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_get.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_put.py index 55299e74e..7434a6a02 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/test_fts_templates_put.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py index f79f415d1..72765c0cb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os import sys diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py index 5ee0892b2..09ae7ee6f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/utils.py index e92a40194..5fc9d5b45 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/utils.py index ebf64ea2b..d47688026 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py index f5f4cbd42..4c2dd89fe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_msql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_msql.py index ef832a340..7b2c1cdf7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/test_column_msql.py @@ -9,6 +9,7 @@ import json import uuid +from urllib.parse import urlencode from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils @@ -21,11 +22,6 @@ from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as columns_utils -try: - from urllib.parse import urlencode -except ImportError as e: - from urllib import urlencode - class ColumnMsqlTestCase(BaseTestGenerator): """This class will test msql route of column with various combinations.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py index 828076cab..561b2f82d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_add.py index b777c9128..cce634d5d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_add.py @@ -9,6 +9,7 @@ import json import uuid +from unittest.mock import patch from pgadmin.utils import server_utils as server_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ @@ -26,11 +27,6 @@ from . import utils as compound_trigger_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class CompoundTriggersAddTestCase(BaseTestGenerator): """This class will add new compound trigger under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete.py index 92e0f95dc..6f25444c4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete.py @@ -8,6 +8,7 @@ ########################################################################## import uuid +from unittest.mock import patch from pgadmin.utils import server_utils as server_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ @@ -22,11 +23,6 @@ from regression.python_test_utils import test_utils as utils from . import utils as compound_triggers_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class CompoundTriggersDeleteTestCase(BaseTestGenerator): """This class will delete compound trigger under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete_multiple.py index b00afe0f7..062456f2f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_delete_multiple.py @@ -9,6 +9,7 @@ import uuid import json +from unittest.mock import patch from pgadmin.utils import server_utils as server_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ @@ -23,11 +24,6 @@ from regression.python_test_utils import test_utils as utils from . import utils as compound_triggers_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class CompoundTriggersDeleteMultipleTestCase(BaseTestGenerator): """This class will delete multiple compound triggers under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_get.py index 5f8e4f052..be389dcdd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_get.py @@ -9,6 +9,7 @@ import json import uuid +from unittest.mock import patch from pgadmin.utils import server_utils as server_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ @@ -24,11 +25,6 @@ from . import utils as compound_triggers_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class CompoundTriggersGetTestCase(BaseTestGenerator): """This class will get the compound trigger under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_put.py index e4320118c..349856b11 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/test_compound_triggers_put.py @@ -9,6 +9,7 @@ import json import uuid +from unittest.mock import patch from pgadmin.utils import server_utils as server_utils from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ @@ -24,11 +25,6 @@ from . import utils as compound_triggers_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class CompoundTriggersUpdateTestCase(BaseTestGenerator): """This class will update compound trigger under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/utils.py index 2fcc28cd5..2c6baa590 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/utils.py index 1ec26a290..393b00574 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/utils.py index 9dbf2fb23..88ae6b001 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/utils.py index 836b3bc00..80d810232 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/utils.py index 11dafce4a..3eeffd6af 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py index 9120efeb4..87f46b88a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os import json import sys diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_add.py index 2e7bf9b98..6e64377b4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_add.py @@ -10,6 +10,8 @@ import json import uuid import sys +from unittest.mock import patch + from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ @@ -23,11 +25,6 @@ from . import utils as policy_utils from pgadmin.browser.server_groups.servers.roles.tests import \ utils as roles_utils -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class RulesAddTestCase(BaseTestGenerator): """This class will add new Policy under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete.py index 459d9d624..7639f97ed 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete.py @@ -8,6 +8,7 @@ ########################################################################## import uuid +from unittest.mock import patch from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils @@ -21,11 +22,6 @@ from regression.python_test_utils import test_utils as utils from . import utils as policy_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class PolicyDeleteTestCase(BaseTestGenerator): """This class will delete policy under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_get.py index f34c4425a..09eb613f5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_get.py @@ -8,6 +8,7 @@ ########################################################################## import uuid +from unittest.mock import patch from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils @@ -22,11 +23,6 @@ from . import utils as policy_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class PolicyGetTestCase(BaseTestGenerator): """This class will fetch the Policy under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_put.py index 22c6124e5..2e6c6d97c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_put.py @@ -9,6 +9,7 @@ import json import uuid +from unittest.mock import patch from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils @@ -24,11 +25,6 @@ from pgadmin.browser.server_groups.servers.roles.tests import \ utils as roles_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class PolicyUpdateTestCase(BaseTestGenerator): """This class will update the policy under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/utils.py index 531a57a84..fdd47f7a6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import os diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_add.py index e5b7c85ca..51a816762 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_add.py @@ -10,6 +10,8 @@ import json import uuid import sys +from unittest.mock import patch + from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils from pgadmin.browser.server_groups.servers.databases.schemas.tests import \ @@ -21,11 +23,6 @@ from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as rules_utils -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class RulesAddTestCase(BaseTestGenerator): """This class will add new rule under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete.py index d8c1934ae..aee667bd8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete.py @@ -8,6 +8,7 @@ ########################################################################## import uuid +from unittest.mock import patch from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils @@ -21,11 +22,6 @@ from regression.python_test_utils import test_utils as utils from . import utils as rules_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class RulesDeleteTestCase(BaseTestGenerator): """This class will delete rule under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_get.py index 75df46371..37aa62cba 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_get.py @@ -8,6 +8,7 @@ ########################################################################## import uuid +from unittest.mock import patch from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils @@ -22,11 +23,6 @@ from . import utils as rules_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class RulesGetTestCase(BaseTestGenerator): """This class will fetch the rule under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_put.py index 310b282f1..f90658418 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_put.py @@ -9,6 +9,7 @@ import json import uuid +from unittest.mock import patch from pgadmin.browser.server_groups.servers.databases.schemas.tables.tests \ import utils as tables_utils @@ -21,10 +22,6 @@ from regression import parent_node_dict from regression.python_test_utils import test_utils as utils from . import utils as rules_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch class RulesUpdateTestCase(BaseTestGenerator): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/utils.py index e662e52c8..8f2e1410a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import os diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py index 8e5f665f3..e458dc2c5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_add.py index d36829465..ba52726f1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_add.py @@ -9,6 +9,7 @@ import json import uuid +from unittest.mock import patch from pgadmin.browser.server_groups.servers.databases.schemas.functions.tests \ import utils as trigger_funcs_utils @@ -24,11 +25,6 @@ from regression.python_test_utils import test_utils as utils from . import utils as triggers_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class TriggersAddTestCase(BaseTestGenerator): """This class will add new trigger under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete.py index 81c73db76..0186ae206 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete.py @@ -8,6 +8,7 @@ ########################################################################## import uuid +from unittest.mock import patch from pgadmin.browser.server_groups.servers.databases.schemas.functions.tests \ import utils as trigger_funcs_utils @@ -23,11 +24,6 @@ from regression.python_test_utils import test_utils as utils from . import utils as triggers_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class TriggersDeleteTestCase(BaseTestGenerator): """This class will delete trigger under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_get.py index af5624367..25e1eff4f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_get.py @@ -8,6 +8,7 @@ ########################################################################## import uuid +from unittest.mock import patch from pgadmin.browser.server_groups.servers.databases.schemas.functions.tests \ import utils as trigger_funcs_utils @@ -23,11 +24,6 @@ from regression.python_test_utils import test_utils as utils from . import utils as triggers_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class TriggersGetTestCase(BaseTestGenerator): """This class will fetch trigger under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_put.py index 56acafd74..995a3fc55 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_put.py @@ -9,6 +9,7 @@ import json import uuid +from unittest.mock import patch from pgadmin.browser.server_groups.servers.databases.schemas.functions.tests \ import utils as trigger_funcs_utils @@ -24,11 +25,6 @@ from regression.python_test_utils import test_utils as utils from . import utils as triggers_utils import sys -if sys.version_info < (3, 3): - from mock import patch -else: - from unittest.mock import patch - class TriggersUpdateTestCase(BaseTestGenerator): """This class will update trigger under table node.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/utils.py index 96117387d..eba750816 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/utils.py index c5ffc8329..dac6df73e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/utils.py index 7c39756b7..74e801804 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/utils.py index 2b759178d..a76a370a9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/utils.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/utils.py index fef196089..a4d802a6a 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/utils.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/utils.py index 22a265a13..f9f0739f4 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import traceback diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py b/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py index 2c37fc7bc..3a7ee58fd 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os import pickle diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py index e2db72cd1..378923791 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_add.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py index ecdacf582..1b4459171 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_delete.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import uuid diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py index 7b42ef90c..9f39a53c4 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os import sys diff --git a/web/pgadmin/feature_tests/browser_tool_bar_test.py b/web/pgadmin/feature_tests/browser_tool_bar_test.py index 9d3c15ad2..230e42a6d 100644 --- a/web/pgadmin/feature_tests/browser_tool_bar_test.py +++ b/web/pgadmin/feature_tests/browser_tool_bar_test.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import random diff --git a/web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py b/web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py index 1f3bd651b..0af4f8ac9 100644 --- a/web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py +++ b/web/pgadmin/feature_tests/copy_selected_query_results_feature_test.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import random from selenium.webdriver import ActionChains diff --git a/web/pgadmin/feature_tests/file_manager_test.py b/web/pgadmin/feature_tests/file_manager_test.py index 5daee80db..de945eeb4 100644 --- a/web/pgadmin/feature_tests/file_manager_test.py +++ b/web/pgadmin/feature_tests/file_manager_test.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os import random import string diff --git a/web/pgadmin/feature_tests/keyboard_shortcut_test.py b/web/pgadmin/feature_tests/keyboard_shortcut_test.py index f68e530b4..712017690 100644 --- a/web/pgadmin/feature_tests/keyboard_shortcut_test.py +++ b/web/pgadmin/feature_tests/keyboard_shortcut_test.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import time import sys diff --git a/web/pgadmin/feature_tests/pg_datatype_validation_test.py b/web/pgadmin/feature_tests/pg_datatype_validation_test.py index dc12b51c0..65d7bfbc5 100644 --- a/web/pgadmin/feature_tests/pg_datatype_validation_test.py +++ b/web/pgadmin/feature_tests/pg_datatype_validation_test.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os import json import time diff --git a/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py b/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py index 91b514fe2..5f4461205 100644 --- a/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py +++ b/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import os from selenium.webdriver.support.ui import WebDriverWait diff --git a/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py b/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py index bd28dd9a1..173723a3b 100644 --- a/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py +++ b/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import random import os diff --git a/web/pgadmin/feature_tests/query_tool_auto_complete_tests.py b/web/pgadmin/feature_tests/query_tool_auto_complete_tests.py index 7de94b38d..cb9d3cdb0 100644 --- a/web/pgadmin/feature_tests/query_tool_auto_complete_tests.py +++ b/web/pgadmin/feature_tests/query_tool_auto_complete_tests.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import random diff --git a/web/pgadmin/feature_tests/query_tool_journey_test.py b/web/pgadmin/feature_tests/query_tool_journey_test.py index 4b6c3679d..f439917eb 100644 --- a/web/pgadmin/feature_tests/query_tool_journey_test.py +++ b/web/pgadmin/feature_tests/query_tool_journey_test.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import random diff --git a/web/pgadmin/feature_tests/query_tool_tests.py b/web/pgadmin/feature_tests/query_tool_tests.py index 6c4826994..9328d4b50 100644 --- a/web/pgadmin/feature_tests/query_tool_tests.py +++ b/web/pgadmin/feature_tests/query_tool_tests.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import time diff --git a/web/pgadmin/feature_tests/table_ddl_feature_test.py b/web/pgadmin/feature_tests/table_ddl_feature_test.py index 13b3a88bd..5ff4054b2 100644 --- a/web/pgadmin/feature_tests/table_ddl_feature_test.py +++ b/web/pgadmin/feature_tests/table_ddl_feature_test.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import random from regression.feature_utils.base_feature_test import BaseFeatureTest diff --git a/web/pgadmin/feature_tests/view_data_dml_queries.py b/web/pgadmin/feature_tests/view_data_dml_queries.py index 21921ccb5..4b7d88e4f 100644 --- a/web/pgadmin/feature_tests/view_data_dml_queries.py +++ b/web/pgadmin/feature_tests/view_data_dml_queries.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json import os import time diff --git a/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py b/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py index d2f10a40e..439bbd147 100644 --- a/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py +++ b/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import sys import random diff --git a/web/pgadmin/feature_tests/xss_checks_pgadmin_debugger_test.py b/web/pgadmin/feature_tests/xss_checks_pgadmin_debugger_test.py index 3becd1539..f0cbf9aff 100644 --- a/web/pgadmin/feature_tests/xss_checks_pgadmin_debugger_test.py +++ b/web/pgadmin/feature_tests/xss_checks_pgadmin_debugger_test.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import random from selenium.webdriver import ActionChains diff --git a/web/pgadmin/feature_tests/xss_checks_roles_control_test.py b/web/pgadmin/feature_tests/xss_checks_roles_control_test.py index 37a46fa0c..2b090118a 100644 --- a/web/pgadmin/feature_tests/xss_checks_roles_control_test.py +++ b/web/pgadmin/feature_tests/xss_checks_roles_control_test.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import random from regression.python_test_utils import test_utils diff --git a/web/pgadmin/misc/bgprocess/process_executor.py b/web/pgadmin/misc/bgprocess/process_executor.py index 074554933..13e48efdc 100755 --- a/web/pgadmin/misc/bgprocess/process_executor.py +++ b/web/pgadmin/misc/bgprocess/process_executor.py @@ -29,7 +29,6 @@ It also depends on the following environment variable for proper execution. PROCID - Process-id OUTDIR - Output directory """ -from __future__ import print_function # To make print function compatible with python2 & python3 import sys diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py index e85ebd2e0..63016c39a 100644 --- a/web/pgadmin/misc/bgprocess/processes.py +++ b/web/pgadmin/misc/bgprocess/processes.py @@ -294,8 +294,7 @@ class BatchProcess(object): # anyway be the redundant value in paths. if not current_app.PGADMIN_RUNTIME: paths.insert(0, os.path.join(u_encode(sys.prefix), u'bin')) - python_binary_name = 'python{0}'.format(sys.version_info[0]) \ - if sys.version_info[0] >= 3 else 'python' + python_binary_name = 'python{0}'.format(sys.version_info[0]) interpreter = which(u_encode(python_binary_name), paths) p = None diff --git a/web/pgadmin/misc/file_manager/__init__.py b/web/pgadmin/misc/file_manager/__init__.py index 458a27550..90cd51fe9 100644 --- a/web/pgadmin/misc/file_manager/__init__.py +++ b/web/pgadmin/misc/file_manager/__init__.py @@ -15,6 +15,7 @@ import random import string import sys import time +from urllib.parse import unquote from sys import platform as _platform import config import codecs @@ -39,18 +40,6 @@ if _platform == "win32": SEM_FAIL = SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS file_root = "" -# uppercase supported in py2, ascii_uppercase supported in py3 -try: - letters = string.uppercase -except Exception: - letters = string.ascii_uppercase - -# import unquote from urlib for python2.x and python3.x -try: - from urllib import unquote -except Exception as e: - from urllib.parse import unquote - MODULE_NAME = 'file_manager' global transid @@ -517,7 +506,7 @@ class Filemanager(object): try: drives = [] bitmask = ctypes.windll.kernel32.GetLogicalDrives() - for letter in letters: + for letter in string.ascii_uppercase: if bitmask & 1: drives.append(letter) bitmask >>= 1 diff --git a/web/pgadmin/tools/backup/__init__.py b/web/pgadmin/tools/backup/__init__.py index d083a2e55..0383e2781 100644 --- a/web/pgadmin/tools/backup/__init__.py +++ b/web/pgadmin/tools/backup/__init__.py @@ -9,7 +9,6 @@ """Implements Backup Utility""" -from __future__ import unicode_literals import simplejson as json import os diff --git a/web/pgadmin/tools/search_objects/tests/test_api_search.py b/web/pgadmin/tools/search_objects/tests/test_api_search.py index 3952006d2..f12e9865e 100644 --- a/web/pgadmin/tools/search_objects/tests/test_api_search.py +++ b/web/pgadmin/tools/search_objects/tests/test_api_search.py @@ -7,9 +7,9 @@ # ########################################################################## -from __future__ import print_function import sys import json +from urllib.parse import urlencode from pgadmin.utils.route import BaseTestGenerator from regression import parent_node_dict @@ -17,11 +17,6 @@ from pgadmin.browser.server_groups.servers.databases.tests import utils as \ database_utils from regression.python_test_utils import test_utils as utils -try: - from urllib import urlencode -except Exception as e: - from urllib.parse import urlencode - class SearchObjectsApiSearch(BaseTestGenerator): """ This class will test search API of search objects. """ diff --git a/web/pgadmin/utils/crypto.py b/web/pgadmin/utils/crypto.py index 21ecdc2c2..b33590bec 100644 --- a/web/pgadmin/utils/crypto.py +++ b/web/pgadmin/utils/crypto.py @@ -9,14 +9,10 @@ """This File Provides Cryptography.""" -from __future__ import division - import base64 import hashlib import os -import six - from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.ciphers import Cipher from cryptography.hazmat.primitives.ciphers.algorithms import AES @@ -41,7 +37,7 @@ def encrypt(plaintext, key): # If user has entered non ascii password (Python2) # we have to encode it first - if isinstance(plaintext, six.text_type): + if isinstance(plaintext, str): plaintext = plaintext.encode() return base64.b64encode(iv + encryptor.update(plaintext) + @@ -68,7 +64,7 @@ def decrypt(ciphertext, key): def pad(key): """Add padding to the key.""" - if isinstance(key, six.text_type): + if isinstance(key, str): key = key.encode() # Key must be maximum 32 bytes long, so take first 32 bytes diff --git a/web/pgadmin/utils/csv.py b/web/pgadmin/utils/csv.py index a29eb9aa9..ee586991c 100644 --- a/web/pgadmin/utils/csv.py +++ b/web/pgadmin/utils/csv.py @@ -58,8 +58,6 @@ Agreement. # quote it. ############################################################################ -from __future__ import unicode_literals, absolute_import - __all__ = ["QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE", "Error", "Dialect", "__doc__", "Excel", "ExcelTab", "field_size_limit", "Reader", "Writer", "register_dialect", @@ -74,12 +72,6 @@ from csv import ( __version__, __doc__, Error, field_size_limit, ) -# Stuff needed from six -string_types = str -text_type = str -binary_type = bytes -unichr = chr - class QuoteStrategy(object): quoting = None @@ -123,7 +115,7 @@ class QuoteStrategy(object): return self.dialect.escapechar def prepare(self, raw_field, only=None): - field = text_type(raw_field if raw_field is not None else '') + field = str(raw_field if raw_field is not None else '') quoted = self.quoted(field=field, raw_field=raw_field, only=only) escape_re = self.escape_re(quoted=quoted) @@ -229,7 +221,7 @@ class Writer(object): self.fileobj = fileobj - if isinstance(dialect, text_type): + if isinstance(dialect, str): dialect = get_dialect(dialect) try: @@ -276,7 +268,7 @@ class Reader(object): def __init__(self, fileobj, dialect='excel', **fmtparams): self.input_iter = iter(fileobj) - if isinstance(dialect, text_type): + if isinstance(dialect, str): dialect = get_dialect(dialect) try: @@ -449,7 +441,7 @@ class Reader(object): break raise - if not isinstance(lineobj, text_type): + if not isinstance(lineobj, str): typ = type(lineobj) typ_name = 'bytes' if typ == bytes else typ.__name__ err_str = ('iterator should return strings, not {0}' @@ -478,7 +470,7 @@ _dialect_registry = {} def register_dialect(name, dialect='excel', **fmtparams): - if not isinstance(name, text_type): + if not isinstance(name, str): raise TypeError('"name" must be a string') dialect = Dialect.extend(dialect, fmtparams) @@ -546,7 +538,7 @@ class Dialect(object): if dialect.lineterminator is None: raise Error('lineterminator must be set') - if not isinstance(dialect.lineterminator, text_type): + if not isinstance(dialect.lineterminator, str): raise Error('"lineterminator" must be a string') if dialect.quoting not in [ @@ -562,7 +554,7 @@ class Dialect(object): @staticmethod def validate_text(dialect, attr): val = getattr(dialect, attr) - if not isinstance(val, text_type): + if not isinstance(val, str): if type(val) == bytes: raise Error('"{0}" must be string, not bytes'.format(attr)) raise Error('"{0}" must be string, not {1}'.format( @@ -587,7 +579,7 @@ class Dialect(object): @classmethod def extend(cls, dialect, fmtparams=None): - if isinstance(dialect, string_types): + if isinstance(dialect, str): dialect = get_dialect(dialect) if fmtparams is None: diff --git a/web/pgadmin/utils/driver/psycopg2/__init__.py b/web/pgadmin/utils/driver/psycopg2/__init__.py index 5124d1caa..992c85f5c 100644 --- a/web/pgadmin/utils/driver/psycopg2/__init__.py +++ b/web/pgadmin/utils/driver/psycopg2/__init__.py @@ -366,13 +366,6 @@ class Driver(BaseDriver): if len(val) == 0: continue - if hasattr(str, 'decode') and not isinstance(val, unicode): - # Handling for python2 - try: - val = str(val).encode('utf-8') - except UnicodeDecodeError: - # If already unicode, most likely coming from db - val = str(val).decode('utf-8') value = val if Driver.needsQuoting(val, True): @@ -398,14 +391,6 @@ class Driver(BaseDriver): if not hasattr(val, '__len__'): val = str(val) - if hasattr(str, 'decode') and not isinstance(val, unicode): - # Handling for python2 - try: - val = str(val).encode('utf-8') - except UnicodeDecodeError: - # If already unicode, most likely coming from db - val = str(val).decode('utf-8') - if len(val) == 0: continue diff --git a/web/pgadmin/utils/driver/psycopg2/connection.py b/web/pgadmin/utils/driver/psycopg2/connection.py index 9da91b88c..9c78b502e 100644 --- a/web/pgadmin/utils/driver/psycopg2/connection.py +++ b/web/pgadmin/utils/driver/psycopg2/connection.py @@ -15,7 +15,6 @@ object. import random import select -import six import datetime from collections import deque import psycopg2 @@ -628,7 +627,7 @@ WHERE # "unicode_escape" will convert single backslash to double # backslash, so we will have to replace/revert them again # to store the correct value into the database. - if isinstance(val, six.string_types): + if isinstance(val, str): modified_val = val.encode('unicode_escape')\ .decode('raw_unicode_escape')\ .replace("\\\\", "\\") diff --git a/web/pgadmin/utils/driver/psycopg2/server_manager.py b/web/pgadmin/utils/driver/psycopg2/server_manager.py index 45d7b4e04..923046e70 100644 --- a/web/pgadmin/utils/driver/psycopg2/server_manager.py +++ b/web/pgadmin/utils/driver/psycopg2/server_manager.py @@ -175,9 +175,6 @@ class ServerManager(object): async_=None, use_binary_placeholder=False, array_to_string=False ): if database is not None: - if hasattr(str, 'decode') and \ - not isinstance(database, unicode): - database = database.decode('utf-8') if did is not None and did in self.db_info: self.db_info[did]['datname'] = database else: diff --git a/web/pgadmin/utils/server_utils.py b/web/pgadmin/utils/server_utils.py index fa39b16fe..fbcd81efe 100644 --- a/web/pgadmin/utils/server_utils.py +++ b/web/pgadmin/utils/server_utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import json diff --git a/web/pgadmin/utils/sqlautocomplete/completion.py b/web/pgadmin/utils/sqlautocomplete/completion.py index 056729976..bcc345b4f 100644 --- a/web/pgadmin/utils/sqlautocomplete/completion.py +++ b/web/pgadmin/utils/sqlautocomplete/completion.py @@ -4,8 +4,6 @@ Using Completion class from blob/master/prompt_toolkit/completion.py """ -from __future__ import unicode_literals - __all__ = ( 'Completion' ) diff --git a/web/pgadmin/utils/sqlautocomplete/parseutils/tables.py b/web/pgadmin/utils/sqlautocomplete/parseutils/tables.py index 94ffc7f46..6c779e8df 100644 --- a/web/pgadmin/utils/sqlautocomplete/parseutils/tables.py +++ b/web/pgadmin/utils/sqlautocomplete/parseutils/tables.py @@ -1,4 +1,3 @@ -from __future__ import print_function import sqlparse from collections import namedtuple from sqlparse.sql import IdentifierList, Identifier, Function diff --git a/web/pgadmin/utils/sqlautocomplete/parseutils/utils.py b/web/pgadmin/utils/sqlautocomplete/parseutils/utils.py index 6bfe7cbf5..878e5c583 100644 --- a/web/pgadmin/utils/sqlautocomplete/parseutils/utils.py +++ b/web/pgadmin/utils/sqlautocomplete/parseutils/utils.py @@ -1,4 +1,3 @@ -from __future__ import print_function import re import sqlparse from sqlparse.sql import Identifier diff --git a/web/pgadmin/utils/sqlautocomplete/sqlcompletion.py b/web/pgadmin/utils/sqlautocomplete/sqlcompletion.py index c5f1f461b..0da04926e 100644 --- a/web/pgadmin/utils/sqlautocomplete/sqlcompletion.py +++ b/web/pgadmin/utils/sqlautocomplete/sqlcompletion.py @@ -1,4 +1,3 @@ -from __future__ import print_function import sys import re import sqlparse @@ -9,9 +8,6 @@ from .parseutils.utils import ( from .parseutils.tables import extract_tables from .parseutils.ctes import isolate_query_ctes -string_types = str - - Special = namedtuple('Special', []) Database = namedtuple('Database', []) Schema = namedtuple('Schema', ['quoted']) @@ -223,7 +219,7 @@ def _split_multiple_statements(full_text, text_before_cursor, parsed): def suggest_based_on_last_token(token, stmt): - if isinstance(token, string_types): + if isinstance(token, str): token_v = token.lower() elif isinstance(token, Comparison): # If 'token' is a Comparison type such as diff --git a/web/regression/feature_utils/pgadmin_page.py b/web/regression/feature_utils/pgadmin_page.py index 4c2628fc0..334956409 100644 --- a/web/regression/feature_utils/pgadmin_page.py +++ b/web/regression/feature_utils/pgadmin_page.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import time import sys diff --git a/web/regression/python_test_utils/test_utils.py b/web/regression/python_test_utils/test_utils.py index d137ffcde..b806f478b 100644 --- a/web/regression/python_test_utils/test_utils.py +++ b/web/regression/python_test_utils/test_utils.py @@ -7,7 +7,6 @@ # ########################################################################## -from __future__ import print_function import fileinput import traceback @@ -24,7 +23,7 @@ from testtools.testcase import clone_test_with_new_id import re import time from selenium.common.exceptions import WebDriverException -import urllib.request as urllib +from urllib.request import urlopen import json from selenium import webdriver from selenium.webdriver.chrome.options import Options @@ -1470,7 +1469,7 @@ def get_selenium_grid_status_json(selenoid_url): :return: """ try: - selenoid_status = urllib.urlopen( + selenoid_status = urlopen( "http://" + re.split('/', (re.split('//', selenoid_url, 1)[1]))[ 0] + "/status", timeout=10) selenoid_status = json.load(selenoid_status) diff --git a/web/regression/re_sql/tests/test_resql.py b/web/regression/re_sql/tests/test_resql.py index 46eeb9e18..85a6aaebc 100644 --- a/web/regression/re_sql/tests/test_resql.py +++ b/web/regression/re_sql/tests/test_resql.py @@ -6,11 +6,11 @@ # This software is released under the PostgreSQL Licence # ########################################################################## -from __future__ import print_function import json import os import re import traceback +from urllib.parse import urlencode from flask import url_for import regression from regression import parent_node_dict @@ -21,17 +21,6 @@ from pgadmin.browser.server_groups.servers.databases.tests import \ from pgadmin.utils.versioned_template_loader import \ get_version_mapping_directories -# import urlencode from urlib for python2.x and python3.x -try: - from urllib import urlencode -except Exception as e: - from urllib.parse import urlencode - -try: - basestring -except NameError: - basestring = str - def create_resql_module_list(all_modules, exclude_pkgs, for_modules): """ @@ -728,7 +717,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): :return: """ - if isinstance(value, basestring) and \ + if isinstance(value, str) and \ value.startswith('<') and value.endswith('>'): # Remove < and > from the string temp_value = value[1:-1] diff --git a/web/regression/runtests.py b/web/regression/runtests.py index 067cdcae8..73d3eb7ba 100644 --- a/web/regression/runtests.py +++ b/web/regression/runtests.py @@ -9,7 +9,6 @@ """ This file collect all modules/files present in tests directory and add them to TestSuite. """ -from __future__ import print_function import argparse import atexit