Remove old Python 2 compatibility code. Fixes #5700 Branch ------ master
Details ------- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=f93cfe8c4cb94fffbc4d273f196a8f06e83c4bb8 Author: Cyril Jouve <jv.cy...@gmail.com> Modified Files -------------- 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 - .../casts/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 - .../servers/databases/casts/tests/test_cast_get.py | 1 - .../tests/test_cast_get_dependencies_dependent.py | 1 - .../databases/casts/tests/test_cast_get_node.py | 1 - .../databases/casts/tests/test_cast_get_sql.py | 1 - .../servers/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 - .../servers/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 - .../tests/test_foreign_servers_delete_multiple.py | 1 - .../test_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 - .../user_mappings/tests/test_user_mapping_add.py | 1 - .../tests/test_user_mapping_delete.py | 1 - .../tests/test_user_mapping_delete_multiple.py | 1 - .../test_user_mapping_dependent_dependency.py | 1 - .../user_mappings/tests/test_user_mapping_get.py | 1 - .../user_mappings/tests/test_user_mapping_msql.py | 1 - .../user_mappings/tests/test_user_mapping_node.py | 1 - .../user_mappings/tests/test_user_mapping_put.py | 1 - .../user_mappings/tests/test_user_mapping_sql.py | 1 - .../foreign_servers/user_mappings/tests/utils.py | 1 - .../foreign_data_wrappers/tests/test_fdw_add.py | 1 - .../foreign_data_wrappers/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 - .../foreign_data_wrappers/tests/test_fdw_get.py | 1 - .../tests/test_fdw_get_nodes.py | 1 - .../tests/test_fdw_get_validators.py | 1 - .../foreign_data_wrappers/tests/test_fdw_msql.py | 1 - .../foreign_data_wrappers/tests/test_fdw_put.py | 1 - .../foreign_data_wrappers/tests/test_fdw_sql.py | 1 - .../databases/foreign_data_wrappers/tests/utils.py | 1 - .../databases/languages/tests/test_language_add.py | 1 - .../languages/tests/test_language_delete.py | 1 - .../tests/test_language_delete_multiple.py | 1 - .../languages/tests/test_language_dependency.py | 1 - .../languages/tests/test_language_dependent.py | 1 - .../databases/languages/tests/test_language_get.py | 1 - .../test_language_get_function_and_template.py | 1 - .../databases/languages/tests/test_language_put.py | 1 - .../databases/languages/tests/test_language_sql.py | 1 - .../servers/databases/languages/tests/utils.py | 1 - .../databases/schemas/collations/tests/utils.py | 1 - .../domains/domain_constraints/tests/utils.py | 1 - .../databases/schemas/domains/tests/utils.py | 1 - .../foreign_tables/tests/test_foreign_table_add.py | 1 - .../tests/test_foreign_table_delete.py | 1 - .../tests/test_foreign_table_delete_multiple.py | 1 - .../foreign_tables/tests/test_foreign_table_get.py | 1 - .../foreign_tables/tests/test_foreign_table_put.py | 1 - .../schemas/foreign_tables/tests/utils.py | 1 - .../tests/test_fts_configuration_add.py | 1 - .../tests/test_fts_configuration_copyConfig.py | 1 - .../tests/test_fts_configuration_delete.py | 1 - .../test_fts_configuration_delete_multiple.py | 1 - .../test_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 - .../tests/test_fts_dictionaries_delete_multiple.py | 1 - .../test_fts_dictionaries_dependency_dependent.py | 1 - .../tests/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 - .../fts_parsers/tests/test_fts_parser_delete.py | 1 - .../tests/test_fts_parser_delete_multiple.py | 1 - .../tests/test_fts_parser_dependency_dependent.py | 1 - .../tests/test_fts_parser_end_functions.py | 1 - .../fts_parsers/tests/test_fts_parser_get.py | 1 - .../fts_parsers/tests/test_fts_parser_get_nodes.py | 1 - .../tests/test_fts_parser_head_line_functions.py | 1 - .../tests/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 - .../databases/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 - .../fts_templates/tests/test_fts_templates_add.py | 1 - .../tests/test_fts_templates_delete.py | 1 - .../tests/test_fts_templates_delete_multiple.py | 1 - .../fts_templates/tests/test_fts_templates_get.py | 1 - .../fts_templates/tests/test_fts_templates_put.py | 1 - .../databases/schemas/fts_templates/tests/utils.py | 1 - .../databases/schemas/functions/tests/utils.py | 1 - .../databases/schemas/packages/tests/utils.py | 1 - .../databases/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 - .../constraints/check_constraint/tests/utils.py | 1 - .../exclusion_constraint/tests/utils.py | 1 - .../tables/constraints/foreign_key/tests/utils.py | 1 - .../constraints/index_constraint/tests/utils.py | 1 - .../schemas/tables/indexes/tests/utils.py | 1 - .../row_security_policies/tests/test_rls_add.py | 7 ++----- .../row_security_policies/tests/test_rls_delete.py | 6 +----- .../row_security_policies/tests/test_rls_get.py | 6 +----- .../row_security_policies/tests/test_rls_put.py | 6 +----- .../tables/row_security_policies/tests/utils.py | 1 - .../schemas/tables/rules/tests/test_rules_add.py | 7 ++----- .../tables/rules/tests/test_rules_delete.py | 6 +----- .../schemas/tables/rules/tests/test_rules_get.py | 6 +----- .../schemas/tables/rules/tests/test_rules_put.py | 5 +---- .../databases/schemas/tables/rules/tests/utils.py | 1 - .../databases/schemas/tables/tests/utils.py | 1 - .../tables/triggers/tests/test_triggers_add.py | 6 +----- .../tables/triggers/tests/test_triggers_delete.py | 6 +----- .../tables/triggers/tests/test_triggers_get.py | 6 +----- .../tables/triggers/tests/test_triggers_put.py | 6 +----- .../schemas/tables/triggers/tests/utils.py | 1 - .../servers/databases/schemas/tests/utils.py | 1 - .../servers/databases/schemas/types/tests/utils.py | 1 - .../servers/databases/schemas/views/tests/utils.py | 1 - .../server_groups/servers/pgagent/tests/utils.py | 1 - .../servers/resource_groups/tests/utils.py | 1 - .../server_groups/servers/roles/tests/utils.py | 1 - .../servers/tablespaces/tests/test_tbspc_add.py | 1 - .../servers/tablespaces/tests/test_tbspc_delete.py | 1 - .../servers/tablespaces/tests/utils.py | 1 - web/pgadmin/feature_tests/browser_tool_bar_test.py | 1 - .../copy_selected_query_results_feature_test.py | 1 - web/pgadmin/feature_tests/file_manager_test.py | 1 - .../feature_tests/keyboard_shortcut_test.py | 1 - .../feature_tests/pg_datatype_validation_test.py | 1 - .../pg_utilities_backup_restore_test.py | 1 - .../feature_tests/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 - web/pgadmin/feature_tests/view_data_dml_queries.py | 1 - .../xss_checks_panels_and_query_tool_test.py | 1 - .../xss_checks_pgadmin_debugger_test.py | 1 - .../feature_tests/xss_checks_roles_control_test.py | 1 - web/pgadmin/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 - .../tools/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 -------------- web/pgadmin/utils/driver/psycopg2/connection.py | 3 +-- .../utils/driver/psycopg2/server_manager.py | 3 --- web/pgadmin/utils/server_utils.py | 1 - web/pgadmin/utils/sqlautocomplete/completion.py | 2 -- .../utils/sqlautocomplete/parseutils/tables.py | 1 - .../utils/sqlautocomplete/parseutils/utils.py | 1 - web/pgadmin/utils/sqlautocomplete/sqlcompletion.py | 6 +----- web/regression/feature_utils/pgadmin_page.py | 1 - web/regression/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(-)
