public inbox for [email protected]help / color / mirror / Atom feed
More idiomatic python3 + fix some tests 4+ messages / 3 participants [nested] [flat]
* More idiomatic python3 + fix some tests @ 2020-08-28 20:57 Cyril Jouve <[email protected]> 2020-08-31 11:18 ` Re: More idiomatic python3 + fix some tests Akshay Joshi <[email protected]> 0 siblings, 1 reply; 4+ messages in thread From: Cyril Jouve @ 2020-08-28 20:57 UTC (permalink / raw) To: pgadmin-hackers Hello, patch 1 to 6 generated mostly using 2to3: 0001: https://docs.python.org/3.8/library/2to3.html#2to3fixer-asserts 0002: https://docs.python.org/3.8/library/2to3.html#2to3fixer-filter 0003: https://docs.python.org/3.8/library/2to3.html#2to3fixer-idioms 0004: https://docs.python.org/3.8/library/2to3.html#2to3fixer-metaclass 0005: https://docs.python.org/3.8/library/2to3.html#2to3fixer-xrange 0006: https://docs.python.org/3.8/library/2to3.html#2to3fixer-unicode patch 7 fixes change_password tests: Less that min length : min is 8 instead of 6 Valid password : use an user different than admin user / mock mail module patch 8 fixes ConstraintDeleteMultipleTestCase on py3.10 (using simplejson like in all other modules). Regards, Cyril Attachments: [application/octet-stream] 0001-Replaces-deprecated-unittest-method-names-with-the-c.patch (301.7K, 3-0001-Replaces-deprecated-unittest-method-names-with-the-c.patch) download | inline diff: From e08b2f92180d0fb496ed3fd8ce015c1a0493944b Mon Sep 17 00:00:00 2001 From: Cyril Jouve <[email protected]> Date: Fri, 28 Aug 2020 18:15:52 +0200 Subject: [PATCH 1/7] Replaces deprecated unittest method names with the correct ones. --- .../servers/databases/casts/tests/utils.py | 4 ++-- .../tests/test_event_trigger_add.py | 2 +- .../tests/test_event_trigger_delete.py | 2 +- .../tests/test_event_trigger_delete_multiple.py | 2 +- .../test_event_trigger_dependancy_dependent.py | 2 +- .../tests/test_event_trigger_functions.py | 2 +- .../tests/test_event_trigger_get.py | 4 ++-- .../tests/test_event_trigger_put.py | 2 +- .../tests/test_event_trigger_sql.py | 2 +- .../extensions/tests/test_extension_add.py | 2 +- .../extensions/tests/test_extension_delete.py | 2 +- .../tests/test_extension_delete_multiple.py | 2 +- .../extensions/tests/test_extension_get.py | 2 +- .../extensions/tests/test_extension_put.py | 2 +- .../tests/test_external_tables_module.py | 4 ++-- .../tests/test_external_tables_view.py | 4 ++-- .../tests/test_foreign_servers_add.py | 2 +- .../tests/test_foreign_servers_delete.py | 2 +- .../test_foreign_servers_delete_multiple.py | 2 +- .../test_foreign_servers_dependent_dependency.py | 2 +- .../tests/test_foreign_servers_get.py | 2 +- .../tests/test_foreign_servers_msql.py | 2 +- .../tests/test_foreign_servers_node.py | 2 +- .../tests/test_foreign_servers_put.py | 2 +- .../tests/test_foreign_servers_sql.py | 2 +- .../user_mappings/tests/test_user_mapping_add.py | 2 +- .../tests/test_user_mapping_delete.py | 2 +- .../tests/test_user_mapping_delete_multiple.py | 2 +- .../test_user_mapping_dependent_dependency.py | 2 +- .../user_mappings/tests/test_user_mapping_get.py | 2 +- .../tests/test_user_mapping_msql.py | 2 +- .../tests/test_user_mapping_node.py | 2 +- .../user_mappings/tests/test_user_mapping_put.py | 2 +- .../user_mappings/tests/test_user_mapping_sql.py | 2 +- .../foreign_data_wrappers/tests/test_fdw_add.py | 2 +- .../tests/test_fdw_delete.py | 2 +- .../tests/test_fdw_delete_multiple.py | 2 +- .../tests/test_fdw_dependency_dependent.py | 2 +- .../tests/test_fdw_get-handlers.py | 2 +- .../foreign_data_wrappers/tests/test_fdw_get.py | 2 +- .../tests/test_fdw_get_nodes.py | 2 +- .../tests/test_fdw_get_validators.py | 2 +- .../foreign_data_wrappers/tests/test_fdw_msql.py | 2 +- .../foreign_data_wrappers/tests/test_fdw_put.py | 2 +- .../foreign_data_wrappers/tests/test_fdw_sql.py | 2 +- .../languages/tests/test_language_add.py | 2 +- .../languages/tests/test_language_delete.py | 2 +- .../tests/test_language_delete_multiple.py | 2 +- .../languages/tests/test_language_dependency.py | 2 +- .../languages/tests/test_language_dependent.py | 2 +- .../languages/tests/test_language_get.py | 4 ++-- .../test_language_get_function_and_template.py | 2 +- .../languages/tests/test_language_put.py | 2 +- .../languages/tests/test_language_sql.py | 2 +- .../collations/tests/test_collation_add.py | 2 +- .../collations/tests/test_collation_delete.py | 2 +- .../tests/test_collation_delete_multiple.py | 2 +- .../tests/test_collation_dependency_dependent.py | 2 +- .../collations/tests/test_collation_get.py | 2 +- .../test_collation_get_collation_function.py | 2 +- .../collations/tests/test_collation_get_nodes.py | 2 +- .../collations/tests/test_collation_put.py | 2 +- .../collations/tests/test_collation_sql.py | 2 +- .../tests/test_domain_constraints_add.py | 2 +- .../tests/test_domain_constraints_delete.py | 2 +- .../test_domain_constraints_delete_multiple.py | 2 +- .../tests/test_domain_constraints_dependents.py | 2 +- .../tests/test_domain_constraints_get.py | 2 +- .../tests/test_domain_constraints_msql.py | 2 +- .../tests/test_domain_constraints_node.py | 2 +- .../tests/test_domain_constraints_put.py | 2 +- .../tests/test_domain_constraints_sql.py | 2 +- .../schemas/domains/tests/test_domain_add.py | 2 +- .../schemas/domains/tests/test_domain_delete.py | 2 +- .../domains/tests/test_domain_delete_multiple.py | 2 +- .../tests/test_domain_dependent_dependency.py | 2 +- .../schemas/domains/tests/test_domain_get.py | 2 +- .../domains/tests/test_domain_get_collations.py | 2 +- .../domains/tests/test_domain_get_node.py | 2 +- .../domains/tests/test_domain_get_types_func.py | 2 +- .../schemas/domains/tests/test_domain_msql.py | 2 +- .../schemas/domains/tests/test_domain_put.py | 2 +- .../schemas/domains/tests/test_domain_sql.py | 8 ++++---- .../tests/test_foreign_table_add.py | 2 +- .../tests/test_foreign_table_delete.py | 2 +- .../tests/test_foreign_table_delete_multiple.py | 2 +- .../tests/test_foreign_table_get.py | 2 +- .../tests/test_foreign_table_put.py | 2 +- .../tests/test_fts_configuration_add.py | 2 +- .../tests/test_fts_configuration_copyConfig.py | 2 +- .../tests/test_fts_configuration_delete.py | 4 ++-- .../test_fts_configuration_delete_multiple.py | 2 +- ...est_fts_configuration_dependency_dependent.py | 2 +- .../tests/test_fts_configuration_get.py | 2 +- .../test_fts_configuration_get_dictionaries.py | 2 +- .../tests/test_fts_configuration_get_nodes.py | 2 +- .../tests/test_fts_configuration_get_sql.py | 2 +- .../tests/test_fts_configuration_parsers.py | 2 +- .../tests/test_fts_configuration_put.py | 8 ++++---- .../tests/test_fts_configuration_tokens.py | 2 +- .../tests/test_fts_dictionaries_add.py | 2 +- .../tests/test_fts_dictionaries_delete.py | 4 ++-- .../test_fts_dictionaries_delete_multiple.py | 2 +- ...test_fts_dictionaries_dependency_dependent.py | 2 +- .../test_fts_dictionaries_fetch_templates.py | 2 +- .../tests/test_fts_dictionaries_get.py | 2 +- .../tests/test_fts_dictionaries_get_nodes.py | 2 +- .../tests/test_fts_dictionaries_put.py | 4 ++-- .../fts_parsers/tests/test_fts_parser_add.py | 2 +- .../fts_parsers/tests/test_fts_parser_delete.py | 4 ++-- .../tests/test_fts_parser_delete_multiple.py | 2 +- .../test_fts_parser_dependency_dependent.py | 2 +- .../tests/test_fts_parser_end_functions.py | 2 +- .../fts_parsers/tests/test_fts_parser_get.py | 2 +- .../tests/test_fts_parser_get_nodes.py | 2 +- .../tests/test_fts_parser_head_line_functions.py | 2 +- .../tests/test_fts_parser_lextype_functions.py | 2 +- .../fts_parsers/tests/test_fts_parser_put.py | 2 +- .../tests/test_fts_parser_start_functions.py | 2 +- .../tests/test_fts_parser_token_functions.py | 2 +- .../test_fts_template_dependency_dependent.py | 2 +- .../tests/test_fts_template_get_init.py | 2 +- .../tests/test_fts_template_get_lexize.py | 2 +- .../tests/test_fts_template_get_nodes.py | 2 +- .../tests/test_fts_templates_add.py | 2 +- .../tests/test_fts_templates_delete.py | 4 ++-- .../tests/test_fts_templates_delete_multiple.py | 2 +- .../tests/test_fts_templates_get.py | 2 +- .../tests/test_fts_templates_put.py | 4 ++-- .../schemas/functions/tests/test_function_add.py | 2 +- .../functions/tests/test_function_delete.py | 2 +- .../tests/test_function_delete_multiple.py | 2 +- .../schemas/functions/tests/test_function_get.py | 2 +- .../schemas/functions/tests/test_function_put.py | 2 +- .../functions/tests/test_procedure_add.py | 2 +- .../functions/tests/test_procedure_delete.py | 2 +- .../tests/test_procedure_delete_multiple.py | 2 +- .../functions/tests/test_procedure_exec_sql.py | 4 ++-- .../functions/tests/test_procedure_get.py | 2 +- .../functions/tests/test_procedure_put.py | 2 +- .../functions/tests/test_trigger_func_add.py | 2 +- .../functions/tests/test_trigger_func_delete.py | 2 +- .../tests/test_trigger_func_delete_multiple.py | 2 +- .../functions/tests/test_trigger_func_get.py | 2 +- .../functions/tests/test_trigger_func_put.py | 2 +- .../edbfuncs/tests/test_package_edbfuncs_get.py | 14 +++++++------- .../schemas/packages/tests/test_package_add.py | 2 +- .../packages/tests/test_package_delete.py | 2 +- .../tests/test_package_delete_multiple.py | 2 +- .../schemas/packages/tests/test_package_get.py | 2 +- .../schemas/packages/tests/test_package_put.py | 2 +- .../schemas/sequences/tests/test_sequence_add.py | 2 +- .../sequences/tests/test_sequence_delete.py | 2 +- .../tests/test_sequence_delete_multiple.py | 2 +- .../schemas/sequences/tests/test_sequence_get.py | 2 +- .../schemas/sequences/tests/test_sequence_put.py | 2 +- .../schemas/synonyms/tests/test_synonym_add.py | 2 +- .../synonyms/tests/test_synonym_delete.py | 2 +- .../tests/test_synonym_delete_multiple.py | 2 +- .../schemas/synonyms/tests/test_synonym_get.py | 2 +- .../schemas/synonyms/tests/test_synonym_put.py | 2 +- .../tables/columns/tests/test_column_msql.py | 2 +- .../tests/test_compound_triggers_add.py | 2 +- .../tests/test_compound_triggers_delete.py | 2 +- .../test_compound_triggers_delete_multiple.py | 2 +- .../tests/test_compound_triggers_get.py | 4 ++-- .../tests/test_compound_triggers_put.py | 2 +- .../schemas/tables/indexes/tests/utils.py | 4 ++-- .../row_security_policies/tests/test_rls_add.py | 2 +- .../tests/test_rls_delete.py | 2 +- .../tests/test_rls_delete_multiple.py | 2 +- .../row_security_policies/tests/test_rls_get.py | 2 +- .../row_security_policies/tests/test_rls_put.py | 2 +- .../schemas/tables/rules/tests/test_rules_add.py | 2 +- .../tables/rules/tests/test_rules_delete.py | 2 +- .../rules/tests/test_rules_delete_multiple.py | 2 +- .../schemas/tables/rules/tests/test_rules_get.py | 2 +- .../schemas/tables/rules/tests/test_rules_put.py | 2 +- .../tables/tests/test_column_privileges_put.py | 2 +- .../schemas/tables/tests/test_table_add.py | 2 +- .../schemas/tables/tests/test_table_delete.py | 2 +- .../tables/tests/test_table_delete_multiple.py | 2 +- .../schemas/tables/tests/test_table_get.py | 2 +- .../tables/tests/test_table_parameters.py | 2 +- .../schemas/tables/tests/test_table_put.py | 2 +- .../tables/triggers/tests/test_triggers_add.py | 2 +- .../triggers/tests/test_triggers_delete.py | 2 +- .../tests/test_triggers_delete_multiple.py | 2 +- .../tables/triggers/tests/test_triggers_get.py | 4 ++-- .../tables/triggers/tests/test_triggers_put.py | 2 +- .../databases/schemas/tests/test_schema_add.py | 2 +- .../schemas/tests/test_schema_delete.py | 2 +- .../schemas/tests/test_schema_delete_multiple.py | 2 +- .../schemas/tests/test_schema_dependents.py | 2 +- .../databases/schemas/tests/test_schema_get.py | 2 +- .../schemas/tests/test_schema_get_children.py | 2 +- .../databases/schemas/tests/test_schema_node.py | 2 +- .../databases/schemas/tests/test_schema_put.py | 2 +- .../databases/schemas/tests/test_schema_sql.py | 2 +- .../schemas/types/tests/test_types_add.py | 2 +- .../schemas/types/tests/test_types_delete.py | 2 +- .../types/tests/test_types_delete_multiple.py | 2 +- .../tests/test_types_dependency_dependent.py | 2 +- .../schemas/types/tests/test_types_get.py | 2 +- .../types/tests/test_types_get_collations.py | 2 +- .../tests/test_types_get_external_functions.py | 2 +- .../schemas/types/tests/test_types_get_stypes.py | 2 +- .../types/tests/test_types_get_stypes_opclass.py | 2 +- .../types/tests/test_types_get_subtype_diff.py | 2 +- .../schemas/types/tests/test_types_get_types.py | 2 +- .../schemas/types/tests/test_types_msql.py | 2 +- .../schemas/types/tests/test_types_nodes.py | 2 +- .../schemas/types/tests/test_types_put.py | 2 +- .../schemas/types/tests/test_types_sql.py | 2 +- .../views/tests/test_mviews_parameters.py | 2 +- .../schemas/views/tests/test_mviews_refresh.py | 6 +++--- .../schemas/views/tests/test_views_add.py | 2 +- .../schemas/views/tests/test_views_delete.py | 2 +- .../views/tests/test_views_delete_multiple.py | 2 +- .../schemas/views/tests/test_views_get.py | 2 +- .../schemas/views/tests/test_views_put.py | 2 +- .../servers/databases/tests/test_db_add.py | 2 +- .../servers/databases/tests/test_db_delete.py | 2 +- .../databases/tests/test_db_delete_multiple.py | 2 +- .../servers/databases/tests/test_db_get.py | 2 +- .../servers/databases/tests/test_db_put.py | 2 +- .../servers/pgagent/tests/test_pgagent_add.py | 2 +- .../servers/pgagent/tests/test_pgagent_delete.py | 2 +- .../tests/test_pgagent_delete_multiple.py | 2 +- .../servers/pgagent/tests/test_pgagent_put.py | 2 +- .../pgagent/tests/tests_pgagent_add_schedule.py | 2 +- .../pgagent/tests/tests_pgagent_add_steps.py | 2 +- .../tests_pgagent_delete_multiple_schedules.py | 2 +- .../tests/tests_pgagent_delete_multiple_steps.py | 2 +- .../tests/tests_pgagent_delete_schedule.py | 2 +- .../pgagent/tests/tests_pgagent_delete_steps.py | 2 +- .../servers/pgagent/tests/tests_pgagent_get.py | 2 +- .../pgagent/tests/tests_pgagent_put_schedule.py | 2 +- .../pgagent/tests/tests_pgagent_put_step.py | 2 +- .../servers/pgagent/tests/tests_pgagent_stats.py | 2 +- .../tests/test_resource_groups_add.py | 2 +- .../tests/test_resource_groups_delete.py | 2 +- .../test_resource_groups_delete_multiple.py | 2 +- .../tests/test_resource_groups_put.py | 2 +- .../tests/tests_resource_groups_get.py | 2 +- .../servers/roles/tests/test_role_add.py | 2 +- .../servers/roles/tests/test_role_delete.py | 2 +- .../roles/tests/test_role_delete_multiple.py | 2 +- .../servers/roles/tests/test_role_get.py | 2 +- .../servers/roles/tests/test_role_put.py | 2 +- .../tablespaces/tests/test_backend_supported.py | 2 +- .../servers/tablespaces/tests/test_tbspc_add.py | 2 +- .../tablespaces/tests/test_tbspc_delete.py | 4 ++-- .../servers/tablespaces/tests/test_tbspc_get.py | 2 +- .../servers/tablespaces/tests/test_tbspc_put.py | 2 +- .../test_add_server_with_connect_timeout.py | 2 +- .../tests/test_add_server_with_service_id.py | 2 +- .../tests/test_add_server_with_ssh_tunnel.py | 2 +- .../servers/tests/test_check_ssl_connection.py | 2 +- .../servers/tests/test_is_valid_address.py | 2 +- .../servers/tests/test_server_add.py | 6 +++--- .../servers/tests/test_server_delete.py | 2 +- .../servers/tests/test_server_get.py | 2 +- .../servers/tests/test_server_put.py | 2 +- .../browser/tests/test_change_password.py | 4 ++-- .../browser/tests/test_master_password.py | 14 +++++++------- .../dashboard/tests/test_dashboard_graphs.py | 6 +++--- .../pg_utilities_backup_restore_test.py | 4 ++-- .../pg_utilities_maintenance_test.py | 6 +++--- .../feature_tests/view_data_dml_queries.py | 4 ++-- .../test_check_utility_exists_route_backup.py | 4 ++-- .../tests/test_grant_wizard_get_acl.py | 2 +- .../tests/test_grant_wizard_get_properties.py | 2 +- .../tests/test_grant_wizard_get_sql.py | 2 +- .../tests/test_grant_wizard_save_permissions.py | 2 +- ...t_check_utility_exists_route_import_export.py | 4 ++-- ...est_check_utility_exists_route_maintenance.py | 4 ++-- .../test_check_utility_exists_route_restore.py | 4 ++-- .../schema_diff/tests/test_schema_diff_comp.py | 8 ++++---- .../search_objects/tests/test_api_search.py | 4 ++-- .../tools/search_objects/tests/test_api_types.py | 4 ++-- .../tests/test_search_objects_helper.py | 10 +++++----- .../tests/test_download_csv_query_tool.py | 12 ++++++------ .../tools/sqleditor/tests/test_editor_history.py | 14 +++++++------- .../sqleditor/tests/test_encoding_charset.py | 10 +++++----- .../tools/sqleditor/tests/test_explain_plan.py | 10 +++++----- .../test_extract_sql_from_network_parameters.py | 2 +- .../sqleditor/tests/test_poll_query_tool.py | 8 ++++---- .../sqleditor/tests/test_start_query_tool.py | 4 ++-- .../sqleditor/tests/test_transaction_status.py | 14 +++++++------- .../tools/sqleditor/tests/test_view_data.py | 10 +++++----- .../tests/test_apply_explain_plan_wrapper.py | 2 +- .../utils/tests/test_filter_dialog_callbacks.py | 4 ++-- .../tests/test_is_query_resultset_updatable.py | 12 ++++++------ .../utils/tests/test_save_changed_data.py | 10 +++++----- .../utils/tests/test_start_running_query.py | 4 ++-- .../utils/tests/test_compile_template_name.py | 2 +- web/pgadmin/utils/tests/test_encoding.py | 2 +- web/regression/python_test_utils/test_utils.py | 4 ++-- web/regression/re_sql/tests/test_resql.py | 16 ++++++++-------- 300 files changed, 410 insertions(+), 410 deletions(-) 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 68f9da2cb..c332a327d 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 @@ -121,13 +121,13 @@ def get_database_connection(self): def assert_status_code(self, response): act_res = response.status_code exp_res = self.expected_data["status_code"] - return self.assertEquals(act_res, exp_res) + return self.assertEqual(act_res, exp_res) def assert_error_message(self, response): act_res = response.json["errormsg"] exp_res = self.expected_data["error_msg"] - return self.assertEquals(act_res, exp_res) + return self.assertEqual(act_res, exp_res) def assert_cast_created(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py index 4ffca944a..2f152b7fe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_add.py @@ -122,7 +122,7 @@ class EventTriggerAddTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py index bca67dccc..031a1b725 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete.py @@ -115,7 +115,7 @@ class EventTriggerDeleteTestCase(BaseTestGenerator): response = self.delete_event_trigger() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py index b0e3e4eca..23e64e7c9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_delete_multiple.py @@ -113,7 +113,7 @@ class EventTriggerMultipleDeleteTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_dependancy_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_dependancy_dependent.py index dd9a9284e..3abf1c2eb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_dependancy_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_dependancy_dependent.py @@ -86,7 +86,7 @@ class EventTriggerDependencyDependentTestCase(BaseTestGenerator): response = self.get_dependency_dependent() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_dependency_dependent(self): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_functions.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_functions.py index c4fc0572c..526469669 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_functions.py @@ -104,7 +104,7 @@ class EventTriggerFunctionsTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py index 880f3144e..7e49d19f2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_get.py @@ -123,7 +123,7 @@ class EventTriggerGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database @@ -228,7 +228,7 @@ class EventTriggerGetNodesAndNodeTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py index 08b5d93a2..941e51e9e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_put.py @@ -115,7 +115,7 @@ class EventTriggerPutTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_sql.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_sql.py index 0b050c844..5cd75a0b0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/tests/test_event_trigger_sql.py @@ -122,7 +122,7 @@ class EventTriggerGetSqlTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 af62ca486..6325b2442 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 @@ -46,7 +46,7 @@ class ExtensionsAddTestCase(BaseTestGenerator): self.db_id) + '/', data=json.dumps(self.data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function disconnect the test database and drop added extension. 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 87639b539..f88e258cb 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 @@ -52,7 +52,7 @@ class ExtensionsDeleteTestCase(BaseTestGenerator): str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.extension_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database. """ 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 a52a8d675..633385137 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 @@ -66,7 +66,7 @@ class ExtensionsDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database. """ 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 23efe5889..a7d37a7b7 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 @@ -48,7 +48,7 @@ class ExtensionsGetTestCase(BaseTestGenerator): self.server_id) + '/' + str(self.db_id) + '/' + str(self.extension_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function disconnect the test database and drop added 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 a25870c2f..5b451e59b 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 @@ -60,7 +60,7 @@ class ExtensionsPutTestCase(BaseTestGenerator): '/' + str(self.extension_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """This function disconnect the test database and drop added 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 56e0ae636..498972290 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 @@ -78,7 +78,7 @@ class TestExternalTablesModule(BaseTestGenerator): manager.sversion = self.manager['sversion'] manager.server_type = self.manager['server_type'] module = ExternalTablesModule('something') - self.assertEquals( + self.assertEqual( self.expected_result, module.backend_supported(manager) ) @@ -96,6 +96,6 @@ class TestExternalTablesModule(BaseTestGenerator): def __test_template_javascript(self): module = ExternalTablesModule('something') - self.assertEquals( + self.assertEqual( self.expected_result, module.module_use_template_javascript) diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py index d474b441d..1306dd3b5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_external_tables_view.py @@ -340,8 +340,8 @@ class TestExternalTablesView(BaseTestGenerator): self.manager.connection.assert_called_with( **self.expected_manager_connection_to_be_called_with ) - self.assertEquals(self.manager, external_tables_view.manager) - self.assertEquals(self.connection, external_tables_view.connection) + self.assertEqual(self.manager, external_tables_view.manager) + self.assertEqual(self.connection, external_tables_view.connection) @patch('pgadmin.browser.server_groups.servers.databases.external_tables' '.render_template') 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 3ec9a76f1..f7d96dbed 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 @@ -101,7 +101,7 @@ class ForeignServerAddTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added foreign 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 a7ab075d8..c558f2387 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 @@ -87,7 +87,7 @@ class ForeignServerDeleteTestCase(BaseTestGenerator): actual_response_code = delete_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop 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 fe91d8c20..50a4a6027 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 @@ -90,7 +90,7 @@ class ForeignServerDeleteMultipleTestCase(BaseTestGenerator): actual_response_code = delete_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added 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 383d4bef1..5bd53c70d 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 @@ -79,7 +79,7 @@ class ForeignServerDependentsAndDependencyTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop 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 2e897bc96..5e2b2047d 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 @@ -104,7 +104,7 @@ class ForeignServerGetTestCase(BaseTestGenerator): actual_response_code = fsrv_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added extension 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 024b7d093..78bb2c3ec 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 @@ -81,7 +81,7 @@ class ForeignServerGetSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 186bf4dc7..6badd2503 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 @@ -90,7 +90,7 @@ class ForeignServerGetNodeTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop 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 23c2ec814..aa4f04907 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 @@ -91,7 +91,7 @@ class ForeignServerPutTestCase(BaseTestGenerator): actual_response_code = put_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added extension 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 07f5dc47f..fc567c71e 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 @@ -92,7 +92,7 @@ class ForeignServerGetSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database 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 9cf6e2d1c..626c62e7c 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 @@ -109,7 +109,7 @@ class UserMappingAddTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added extension 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 2dea5ade7..c4e264931 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 @@ -105,7 +105,7 @@ class UserMappingDeleteTestCase(BaseTestGenerator): actual_response_code = delete_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop 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 3bf23a4f0..d21e73daf 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 @@ -90,7 +90,7 @@ class UserMappingDeleteMultipleTestCase(BaseTestGenerator): actual_response_code = delete_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop 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 f09c09d34..d0dbf8f2b 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 @@ -88,7 +88,7 @@ class UserMappingDependentsAndDependencyTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop 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 e555fcd03..94ec72435 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 @@ -115,7 +115,7 @@ class UserMappingGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added extension 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 ff1ee59c5..6078c0f3f 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 @@ -90,7 +90,7 @@ class UserMappingGetMSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added 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 4d9f830eb..dfb7130a7 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 @@ -98,7 +98,7 @@ class UserMappingNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop 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 22e5ee239..5330191ef 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 @@ -100,7 +100,7 @@ class UserMappingPutTestCase(BaseTestGenerator): actual_response_code = put_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added 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 5b43e47b0..9d4bebf19 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 @@ -101,7 +101,7 @@ class UserMappingGetSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added 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 a6d0acc0f..bdef897f2 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 @@ -76,7 +76,7 @@ class FDWDAddTestCase(BaseTestGenerator): del self.data['name'] response = self.create_foreign_data_wrapper() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): 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 e3a0a86f2..c4344c6da 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 @@ -82,7 +82,7 @@ class FDWDeleteTestCase(BaseTestGenerator): self.fdw_id = 99999 response = self.delete_fdw() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): 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 9080209f1..c8752eccf 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 @@ -73,7 +73,7 @@ class FDWDDeleteMultipleTestCase(BaseTestGenerator): data = {'ids': self.fdw_ids} delete_response = self.delete_multiple(data) - self.assertEquals(delete_response.status_code, + self.assertEqual(delete_response.status_code, self.expected_data['status_code']) def tearDown(self): 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 070549ea8..50f2c6cd7 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 @@ -67,7 +67,7 @@ class FDWDependencyAndDependentTestCase(BaseTestGenerator): response = self.get_dependency_dependent() expected_response_code = self.expected_data['status_code'] - self.assertEquals(response.status_code, expected_response_code) + self.assertEqual(response.status_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added extension 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 ba0659444..4679373d7 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 @@ -72,7 +72,7 @@ class FDWHandlersTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.get_handlers_fdw() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): 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 22272cf46..4496b0c2e 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 @@ -90,7 +90,7 @@ class FDWDGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the FDW and disconnect the test database """ 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 b95596351..c366c9e8d 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 @@ -95,7 +95,7 @@ class FDWDNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect the test database and drop added extension 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 a61e28b23..f10ba0dc0 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 @@ -71,7 +71,7 @@ class FDWValidatorsTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.get_validators_fdw() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): 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 cee903777..9411bd95f 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 @@ -64,7 +64,7 @@ class FDWDGetMSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it 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 e89a86f1b..080cfd868 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 @@ -74,7 +74,7 @@ class FDWDPutTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): put_response = self.update_fdw() - self.assertEquals(put_response.status_code, + self.assertEqual(put_response.status_code, self.expected_data['status_code']) def tearDown(self): 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 67392fde9..afeb819df 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 @@ -74,7 +74,7 @@ class FDWDGetSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it 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 d823ed6b4..6f3bf1344 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 @@ -72,7 +72,7 @@ class LanguagesAddTestCase(BaseTestGenerator): response = self.create_language() actual_status_code = response.status_code expected_status_code = self.expected_data["status_code"] - self.assertEquals(actual_status_code, expected_status_code) + self.assertEqual(actual_status_code, expected_status_code) def create_language(self): """This function will add language under test database.""" 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 36839b79c..c878b7cfa 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 @@ -63,7 +63,7 @@ class LanguagesDeleteTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def delete_language(self): """This function will delete language under test database.""" 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 1bc308703..ab9dc56ad 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 @@ -57,7 +57,7 @@ class LanguagesDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" 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 543b0f008..ea46a1078 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 @@ -45,7 +45,7 @@ class LanguagesGetDependencyTestCase(BaseTestGenerator): response = self.get_language_dependency() actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def get_language_dependency(self): """ 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 cfcb64b23..fa3600db7 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 @@ -44,7 +44,7 @@ class LanguagesGetDependentTestCase(BaseTestGenerator): response = self.get_language_dependency() actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def get_language_dependency(self): """ 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 334674687..39c3a4e92 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 @@ -84,7 +84,7 @@ class LanguagesGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def get_language_properties(self): return self.tester.get("{0}{1}/{2}/{3}/{4}".format( @@ -147,7 +147,7 @@ class LanguagesGetNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def get_language_nodes(self): return self.tester.get("{0}{1}/{2}/{3}/".format( 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 4526d908e..6b06a7bbb 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 @@ -51,7 +51,7 @@ class LanguagesGetFunctionAndTemplateTestCase(BaseTestGenerator): response = self.get_language_functions_template() actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def get_language_functions_template(self): """ 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 2d45304e2..3a5a3eba1 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 @@ -56,7 +56,7 @@ class LanguagesPutTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def update_language(self): 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 77caf71e0..99a512921 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 @@ -56,7 +56,7 @@ class LanguagesGetSql(BaseTestGenerator): response = self.get_language_sql() actual_response_code = response.status_code expected_status_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_status_code) + self.assertEqual(actual_response_code, expected_status_code) def get_language_sql(self): """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py index 925e3517c..4f960fa8f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_add.py @@ -103,7 +103,7 @@ class CollationAddTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py index 2eb41d920..b31ca339b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete.py @@ -89,7 +89,7 @@ class CollationDeleteTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py index 610159654..a79d4e3a5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_delete_multiple.py @@ -83,7 +83,7 @@ class CollationDeleteMultipleTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_dependency_dependent.py index cd6c6f482..ba518a306 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_dependency_dependent.py @@ -70,7 +70,7 @@ class CollationDependentsTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py index 9cb0aaf36..7a57f8d9a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get.py @@ -98,7 +98,7 @@ class CollationGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_collation_function.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_collation_function.py index 612be34cb..ecd419c9d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_collation_function.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_collation_function.py @@ -78,7 +78,7 @@ class CollationGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data["status_code"] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_nodes.py index ac890ce8c..087e4fc86 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_get_nodes.py @@ -91,7 +91,7 @@ class CollationNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py index d21c0b0bf..cc3c73654 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_put.py @@ -94,7 +94,7 @@ class CollationPutTestCase(BaseTestGenerator): actual_response_code = put_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_sql.py index ee5b301bc..66689cac9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/test_collation_sql.py @@ -89,7 +89,7 @@ class CollationSqlTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_add.py index 358ab74d1..1941d7a11 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_add.py @@ -97,7 +97,7 @@ class DomainConstraintAddTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete.py index 53bbe6550..92ab39924 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete.py @@ -106,7 +106,7 @@ class DomainConstraintDeleteTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete_multiple.py index f4da799c2..745e0b95c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_delete_multiple.py @@ -108,7 +108,7 @@ class DomainConstraintDeleteMultipleTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect database to delete it diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_dependents.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_dependents.py index 89d5812e8..e82f39ffd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_dependents.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_dependents.py @@ -100,7 +100,7 @@ class DomainConstraintDependentAndDependencyTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_get.py index 7c455a9ad..be2609c90 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_get.py @@ -128,7 +128,7 @@ class DomainConstraintGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_msql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_msql.py index 5daa2621e..1cef1e3a4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_msql.py @@ -107,7 +107,7 @@ class DomainConstraintMsqlTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_node.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_node.py index c6462135d..9000a0717 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_node.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_node.py @@ -132,7 +132,7 @@ class DomainConstraintNodeAndNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_put.py index d5ff4891a..07fabbaaf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_put.py @@ -109,7 +109,7 @@ class DomainConstraintPutTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_sql.py index d48ab04be..3e708977b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/tests/test_domain_constraints_sql.py @@ -111,7 +111,7 @@ class DomainConstraintGetSqlTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py index 979500cfb..2b1f73270 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_add.py @@ -84,7 +84,7 @@ class DomainAddTestCase(BaseTestGenerator): expected_response_code = self.expected_data['status_code'] - self.assertEquals(response.status_code, expected_response_code) + self.assertEqual(response.status_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py index eed0c6eef..c34edd91a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete.py @@ -83,7 +83,7 @@ class DomainDeleteTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py index 6ff6ec18f..35b1bc704 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_delete_multiple.py @@ -80,7 +80,7 @@ class DomainDeleteMultipleTestCase(BaseTestGenerator): actual_response_code = get_response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_dependent_dependency.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_dependent_dependency.py index c15386d54..f23c87fb2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_dependent_dependency.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_dependent_dependency.py @@ -70,7 +70,7 @@ class DomainGetDependentsAndDependencyTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py index 25c9d5d1e..0a301e259 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get.py @@ -98,7 +98,7 @@ class DomainGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_collations.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_collations.py index d4f580210..7857ca780 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_collations.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_collations.py @@ -76,7 +76,7 @@ class DomainGetCollationsTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_node.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_node.py index b11f91705..1034f14ae 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_node.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_node.py @@ -86,7 +86,7 @@ class DomainGetNodeTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_types_func.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_types_func.py index 8c4fa016d..b6c73181d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_types_func.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_get_types_func.py @@ -82,7 +82,7 @@ class DomainGetTypesTestCase(BaseTestGenerator): expected_response_code = self.expected_data['status_code'] - self.assertEquals(response.status_code, expected_response_code) + self.assertEqual(response.status_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_msql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_msql.py index 16972ae30..e8e217f59 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_msql.py @@ -74,7 +74,7 @@ class DomainMsqlTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_put.py index aafd0ba45..e0cbcc16e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_put.py @@ -92,7 +92,7 @@ class DomainPutTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_sql.py index ffe4a11dc..0c96644d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/test_domain_sql.py @@ -95,7 +95,7 @@ class DomainReverseEngineeredSQLTestCase(BaseTestGenerator): get_response = self.get_sql() expected_response_code = self.expected_data['status_code'] - self.assertEquals(get_response.status_code, expected_response_code) + self.assertEqual(get_response.status_code, expected_response_code) orig_sql = json.loads(get_response.data.decode('utf-8')) # Replace multiple spaces with one space and check the expected sql @@ -108,7 +108,7 @@ class DomainReverseEngineeredSQLTestCase(BaseTestGenerator): self.test_data['domain_sql'], self.server["username"]) - self.assertEquals(sql, expected_sql) + self.assertEqual(sql, expected_sql) domain_utils.delete_domain(self.server, db_name, @@ -129,14 +129,14 @@ class DomainReverseEngineeredSQLTestCase(BaseTestGenerator): get_response = self.get_sql() expected_response_code = self.expected_data['status_code'] - self.assertEquals(get_response.status_code, + self.assertEqual(get_response.status_code, expected_response_code) if hasattr(self, "wrong_domain_id"): self.domain_id = 99999 get_response = self.get_sql() expected_response_code = self.expected_data['status_code'] - self.assertEquals(get_response.status_code, + self.assertEqual(get_response.status_code, expected_response_code) def tearDown(self): 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 6a01b547d..67ea5cd1c 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 @@ -96,7 +96,7 @@ class ForeignTableAddTestCase(BaseTestGenerator): str(self.schema_id) + '/', data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """ This function disconnect the test database and delete test 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 43641a54e..dd51aa970 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 @@ -86,7 +86,7 @@ class ForeignTableDeleteTestCase(BaseTestGenerator): str(self.ft_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """ This function disconnect the test database. """ 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 73e18afe9..432cec063 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 @@ -90,7 +90,7 @@ class ForeignTableDeleteMultipleTestCase(BaseTestGenerator): follow_redirects=True, data=json.dumps(data)) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """ This function disconnect the test database. """ 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 d8c20e9c0..623950cc5 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 @@ -81,7 +81,7 @@ class ForeignTableGetTestCase(BaseTestGenerator): str(self.ft_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """ This function disconnect the test database and delete test 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 ae6752c73..99f9552f7 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 @@ -95,7 +95,7 @@ class ForeignTablePutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """ This function disconnect the test database and delete test 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 24647349a..79d4c1e3b 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 @@ -80,7 +80,7 @@ class FTSConfiguraionAddTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts_config and disconnect the test 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 3f2609001..1dce50fd3 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 @@ -108,7 +108,7 @@ class FTSConfigurationDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_config and disconnect the test 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 0aeedd355..f7e4fa0f7 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 @@ -75,7 +75,7 @@ class FTSConfDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(self.fts_conf_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) negative_delete_response = self.tester.delete( self.url + str(utils.SERVER_GROUP) + '/' + @@ -84,7 +84,7 @@ class FTSConfDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(0), follow_redirects=True) - self.assertEquals(negative_delete_response.status_code, 500) + self.assertEqual(negative_delete_response.status_code, 500) def tearDown(self): """This function disconnect the test database.""" 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 4facacc35..43b4209f7 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 @@ -79,7 +79,7 @@ class FTSConfDeleteMultipleTestCase(BaseTestGenerator): follow_redirects=True, data=json.dumps(data), content_type='html/json') - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" 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 2be915a85..5ff52007c 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 @@ -92,7 +92,7 @@ class FTSConfigurationDependencyDependentTestCase(BaseTestGenerator): response = self.get_dependency_dependent() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_dependency_dependent(self): """ 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 21eeb9bc9..9e5effead 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 @@ -71,7 +71,7 @@ class FTSConfGetTestCase(BaseTestGenerator): str(self.fts_conf_id), content_type='html/json') - self.assertEquals(get_response.status_code, 200) + self.assertEqual(get_response.status_code, 200) def tearDown(self): """This function delete the fts_config and disconnect the test 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 391e4efbe..1c2ef1f58 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 @@ -109,7 +109,7 @@ class FTSConfigurationDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_config and disconnect the test 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 e81865e0d..a74744dce 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 @@ -129,7 +129,7 @@ class FTSConfigurationNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_config and disconnect the test 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 20aca7cf2..b59286468 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 @@ -111,7 +111,7 @@ class FTSConfigurationDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_config and disconnect the test 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 86bb8ef24..f9e90ba6a 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 @@ -108,7 +108,7 @@ class FTSConfigurationDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_config and disconnect the test 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 3b97a1a55..76d4cecbc 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 @@ -87,7 +87,7 @@ class FTSConfPutTestCase(BaseTestGenerator): str(self.fts_conf_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) negative_put_response = self.tester.put( self.url + str(utils.SERVER_GROUP) + '/' + @@ -97,7 +97,7 @@ class FTSConfPutTestCase(BaseTestGenerator): str(0), data=json.dumps(data), follow_redirects=True) - self.assertEquals(negative_put_response.status_code, 500) + self.assertEqual(negative_put_response.status_code, 500) def tearDown(self): """This function delete the fts_config and disconnect the test @@ -187,7 +187,7 @@ class FTSConfDictPutTestCase(BaseTestGenerator): str(self.fts_conf_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) # check again whether dictionary is schema qualified get_response = self.tester.get( @@ -200,7 +200,7 @@ class FTSConfDictPutTestCase(BaseTestGenerator): response_data = json.loads(get_response.data) res_dictname = response_data["tokens"][0]["dictname"] - self.assertEquals(dictname, res_dictname[0]) + self.assertEqual(dictname, res_dictname[0]) def tearDown(self): """This function delete the fts_config and disconnect the test 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 cf13c134f..a973b82c0 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 @@ -110,7 +110,7 @@ class FTSConfigurationDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_config and disconnect the test 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 504817b49..c7b36dd2b 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 @@ -75,7 +75,7 @@ class FtsDictionaryAddTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts dictionaries and disconnect the test 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 60dd87b51..f85c939c7 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 @@ -78,7 +78,7 @@ class FtsDictionaryDeleteTestCase(BaseTestGenerator): str(self.fts_dict_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) negative_delete_response = self.tester.delete( self.url + str(utils.SERVER_GROUP) + '/' + @@ -88,7 +88,7 @@ class FtsDictionaryDeleteTestCase(BaseTestGenerator): str(0), follow_redirects=True) - self.assertEquals(negative_delete_response.status_code, 500) + self.assertEqual(negative_delete_response.status_code, 500) def tearDown(self): """This function disconnect the test database.""" 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 c87b10f90..9bb243a39 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 @@ -94,7 +94,7 @@ class FtsDictionaryDeleteMultipleTestCase(BaseTestGenerator): content_type='html/json', follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" 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 0b2dea079..a65faa58e 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 @@ -92,7 +92,7 @@ class FTSDictionariesDependencyDependentTestCase(BaseTestGenerator): response = self.get_dependency_dependent() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_dependency_dependent(self): """ 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 2f19db086..598495306 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 @@ -109,7 +109,7 @@ class FTSDictionariesDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_dict and disconnect the test 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 ea32d2260..9d55b18a5 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 @@ -69,7 +69,7 @@ class FtsDictionaryGetTestCase(BaseTestGenerator): str(self.fts_dict_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts dictionaries and disconnect the test 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 afa06bf91..43a3cb78e 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 @@ -129,7 +129,7 @@ class FTSDictionariesNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_dict and disconnect the test 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 0fe1aa840..d593d1b9f 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 @@ -86,7 +86,7 @@ class FtsDictionaryPutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) negative_put_response = self.tester.put( self.url + str(utils.SERVER_GROUP) + '/' + @@ -97,7 +97,7 @@ class FtsDictionaryPutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(negative_put_response.status_code, 500) + self.assertEqual(negative_put_response.status_code, 500) def tearDown(self): """This function delete the fts dictionaries and disconnect the test 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 f99faf342..2187a3a79 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 @@ -71,7 +71,7 @@ class FtsParserAddTestCase(BaseTestGenerator): data=json.dumps(self.data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts_parser and disconnect the test 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 18448b871..8aae4a518 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 @@ -76,7 +76,7 @@ class FtsParserDeleteTestCase(BaseTestGenerator): str(self.fts_parser_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) negative_delete_response = self.tester.delete( self.url + str(utils.SERVER_GROUP) + '/' + @@ -86,7 +86,7 @@ class FtsParserDeleteTestCase(BaseTestGenerator): str(0), follow_redirects=True) - self.assertEquals(negative_delete_response.status_code, 500) + self.assertEqual(negative_delete_response.status_code, 500) def tearDown(self): """This function disconnect the test database.""" 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 735f63bbe..23682c134 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 @@ -94,7 +94,7 @@ class FtsParserDeleteMultipleTestCase(BaseTestGenerator): content_type='html/json', follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" 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 546db4601..3b58c2ccf 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 @@ -92,7 +92,7 @@ class FTSParsersDependencyDependentTestCase(BaseTestGenerator): response = self.get_dependency_dependent() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_dependency_dependent(self): """ 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 508ab8762..f9be61e05 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 @@ -110,7 +110,7 @@ class FTSParsersEndFunctionTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_parser and disconnect the test 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 89738aaa1..a73c498b8 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 @@ -67,7 +67,7 @@ class FtsParserGetTestCase(BaseTestGenerator): str(self.fts_parser_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts_parser and disconnect the test 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 35d101d4d..87d5df6db 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 @@ -129,7 +129,7 @@ class FTSParsersNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_parser and disconnect the test 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 e3bb75531..35e60da63 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 @@ -110,7 +110,7 @@ class FTSParsersNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_parser and disconnect the test 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 3ca2233c8..3e77cce58 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 @@ -110,7 +110,7 @@ class FTSParsersLexTypeTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_parser and disconnect the test 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 0f0ea3c2a..1c777bad6 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 @@ -85,7 +85,7 @@ class FtsParserPutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """This function delete the fts_parser and disconnect the test 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 f8447efa8..a61c154fe 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 @@ -110,7 +110,7 @@ class FTSParsersEndFunctionTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_parser and disconnect the test 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 e27f42150..2e43dd155 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 @@ -110,7 +110,7 @@ class FTSParsersTokenFunctionTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function delete the fts_parser and disconnect the test 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 85da79723..0df58fcee 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 @@ -92,7 +92,7 @@ class FTSTemplatesDependencyDependentTestCase(BaseTestGenerator): response = self.get_dependency_dependent() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_dependency_dependent(self): """ 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 45a7cab26..3ace9f3bc 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 @@ -100,7 +100,7 @@ class FTSTemplatesGetInitTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_init(self): """ 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 c4c1a7434..da2b3d44e 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 @@ -100,7 +100,7 @@ class FTSTemplatesGetLexizeTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_lexzie(self): """ 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 2cb7412a4..63dccebe7 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 @@ -105,7 +105,7 @@ class FTSTemplatesDependencyDependentTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def get_fts_templates_nodes(self): """ 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 050a48db9..e3ce269e5 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 @@ -72,7 +72,7 @@ class FtsTemplateAddTestCase(BaseTestGenerator): data=json.dumps(self.data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts_template and disconnect the test 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 b49c27327..0a7811a38 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 @@ -75,7 +75,7 @@ class FtsTemplateDeleteTestCase(BaseTestGenerator): str(self.fts_temp_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) negative_delete_response = self.tester.delete( self.url + str(utils.SERVER_GROUP) + '/' + @@ -85,7 +85,7 @@ class FtsTemplateDeleteTestCase(BaseTestGenerator): str(0), follow_redirects=True) - self.assertEquals(negative_delete_response.status_code, 500) + self.assertEqual(negative_delete_response.status_code, 500) def tearDown(self): """This function disconnect the test database.""" 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 e09569a68..d4aef6248 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 @@ -92,7 +92,7 @@ class FtsTemplateDeleteMultipleTestCase(BaseTestGenerator): content_type='html/json', follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" 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 e49beba5b..a0bcf093b 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 @@ -69,7 +69,7 @@ class FtsTemplateGetTestCase(BaseTestGenerator): str(self.fts_temp_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the fts_template and disconnect the test 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 7434a6a02..517c5a17c 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 @@ -84,7 +84,7 @@ class FtsTemplatePutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) negative_put_response = self.tester.put( self.url + str(utils.SERVER_GROUP) + '/' + @@ -95,7 +95,7 @@ class FtsTemplatePutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(negative_put_response.status_code, 500) + self.assertEqual(negative_put_response.status_code, 500) def tearDown(self): """This function delete the fts_template and disconnect the test diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_add.py index 9a1063d52..2eb6139e3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_add.py @@ -90,6 +90,6 @@ class FunctionAddTestCase(BaseTestGenerator): content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete.py index 6dd6bf806..4244aaab0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete.py @@ -41,7 +41,7 @@ class FunctionDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(func_id), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py index d822e4e21..a0c0f93d9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_delete_multiple.py @@ -48,7 +48,7 @@ class FunctionDeleteTestCase(BaseTestGenerator): follow_redirects=True, content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_get.py index a44a22f81..17ba1159c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_get.py @@ -41,7 +41,7 @@ class FunctionGetTestCase(BaseTestGenerator): str(self.db_id) + '/' + str(self.schema_id) + '/' + str(trigger_func_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_put.py index 4ca810e26..1db46a313 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_function_put.py @@ -60,7 +60,7 @@ class FunctionPutTestCase(BaseTestGenerator): str(func_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_add.py index c3940f566..7496b52ed 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_add.py @@ -88,6 +88,6 @@ class ProcedureAddTestCase(BaseTestGenerator): content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py index cc6c189ee..aa7e40b44 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete.py @@ -48,7 +48,7 @@ class procedureDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(proc_id), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py index 0402a0dbc..31b0f3956 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_delete_multiple.py @@ -56,7 +56,7 @@ class procedureDeleteMultipleTestCase(BaseTestGenerator): content_type='html/json', follow_redirects=True ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_exec_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_exec_sql.py index a9b4eb0a8..d1f478f66 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_exec_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_exec_sql.py @@ -54,7 +54,7 @@ class ProcedureExecSQLTestCase(BaseTestGenerator): '/' + str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/' + str(proc_id)) - self.assertEquals(exec_response.status_code, 200) + self.assertEqual(exec_response.status_code, 200) exec_sql = json.loads(exec_response.data.decode('utf-8')) # Replace multiple spaces with one space and check the expected sql @@ -68,7 +68,7 @@ class ProcedureExecSQLTestCase(BaseTestGenerator): expected_sql = self.expected_sql.format("EXEC", self.schema_name, proc_name) - self.assertEquals(sql, expected_sql) + self.assertEqual(sql, expected_sql) # Verify the EXEC SQL by running it if we don't have arguments if not self.with_args: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py index 678346878..9ba1e4a5b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_get.py @@ -47,7 +47,7 @@ class ProcedureGetTestCase(BaseTestGenerator): str(self.db_id) + '/' + str(self.schema_id) + '/' + str(proc_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py index 9c17a8795..aceb01853 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_procedure_put.py @@ -54,7 +54,7 @@ class ProcedurePutTestCase(BaseTestGenerator): str(proc_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_add.py index c90453d2b..3cba56ba5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_add.py @@ -86,6 +86,6 @@ class TriggerFuncAddTestCase(BaseTestGenerator): '/', data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete.py index 261488dfb..4e04c71e5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete.py @@ -43,7 +43,7 @@ class TriggerFuncDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(trigger_func_id), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py index d6d1cd037..cc379c3f0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_delete_multiple.py @@ -51,7 +51,7 @@ class TriggerFuncDeleteMultipleTestCase(BaseTestGenerator): follow_redirects=True, content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_get.py index 30cca310f..aaaae5cab 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_get.py @@ -42,7 +42,7 @@ class TriggerFuncGetTestCase(BaseTestGenerator): str(self.db_id) + '/' + str(self.schema_id) + '/' + str(trigger_func_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py index 7bbe3c2d9..94d466c61 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/test_trigger_func_put.py @@ -50,7 +50,7 @@ class TriggerFuncPutTestCase(BaseTestGenerator): str(trigger_func_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/test_package_edbfuncs_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/test_package_edbfuncs_get.py index 11fb61903..b5ae914cd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/test_package_edbfuncs_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/tests/test_package_edbfuncs_get.py @@ -111,11 +111,11 @@ END %s;""" % (self.schema_name, self.pkg_name, self.proc_name, response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(response.status_code, 200) - self.assertEquals(len(response_data['data']), 1) - self.assertEquals(response_data['data'][0]['label'], + self.assertEqual(response.status_code, 200) + self.assertEqual(len(response_data['data']), 1) + self.assertEqual(response_data['data'][0]['label'], self.func_name + '()') - self.assertEquals(response_data['data'][0]['_type'], 'edbfunc') + self.assertEqual(response_data['data'][0]['_type'], 'edbfunc') # Fetch Package procedure url = self.url.format('edbproc') + str( @@ -127,11 +127,11 @@ END %s;""" % (self.schema_name, self.pkg_name, self.proc_name, response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(response.status_code, 200) - self.assertEquals(len(response_data['data']), 1) + self.assertEqual(response.status_code, 200) + self.assertEqual(len(response_data['data']), 1) self.assertIn(self.proc_name, response_data['data'][0]['label']) self.assertIn("INOUT", response_data['data'][0]['label']) - self.assertEquals(response_data['data'][0]['_type'], 'edbproc') + self.assertEqual(response_data['data'][0]['_type'], 'edbproc') def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_add.py index 2e55c29a3..1fde69ed7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_add.py @@ -83,7 +83,7 @@ class PackageAddTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete.py index 9df1c2b4a..ba5e382ca 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete.py @@ -86,7 +86,7 @@ class PackageDeleteTestCase(BaseTestGenerator): str(self.package_id), follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py index de0ccdaca..43f59340c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_delete_multiple.py @@ -92,7 +92,7 @@ class PackageDeleteMultipleTestCase(BaseTestGenerator): content_type='html/json', follow_redirects=True) - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_get.py index 27ba4d89b..9185bf829 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_get.py @@ -79,7 +79,7 @@ class PackageGetTestCase(BaseTestGenerator): str(self.package_id), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_put.py index 831bf944c..8cc9dac29 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/test_package_put.py @@ -92,7 +92,7 @@ class PackagePutTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """This function disconnect the test database.""" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_add.py index 7c1e8aaac..6745c72f3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_add.py @@ -119,7 +119,7 @@ class SequenceAddTestCase(BaseTestGenerator): '/' + str(schema_id) + '/', data=json.dumps(self.data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete.py index 294bc4d63..45e12c534 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete.py @@ -62,7 +62,7 @@ class SequenceDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(self.sequence_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py index f5cadd8d5..e04f07659 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_delete_multiple.py @@ -86,7 +86,7 @@ class SequenceDeleteMultipleTestCase(BaseTestGenerator): data=data, content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_get.py index 9120a8900..23832eb63 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_get.py @@ -57,7 +57,7 @@ class SequenceGetTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(self.sequence_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_put.py index 1eeedd106..8b76d90a9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/test_sequence_put.py @@ -91,7 +91,7 @@ class SequencePutTestCase(BaseTestGenerator): str(self.sequence_id), data=json.dumps(self.data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_add.py index 986435bec..6be14cb72 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_add.py @@ -77,7 +77,7 @@ class SynonymAddTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/', data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete.py index bad95bf50..89e7f7248 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete.py @@ -79,7 +79,7 @@ class SynonymDeleteTestCase(BaseTestGenerator): str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/' + str(self.syn_oid), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py index 361f54713..60a689898 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_delete_multiple.py @@ -96,7 +96,7 @@ class SynonymDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json', follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_get.py index 6681f1e6d..41d5c3932 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_get.py @@ -73,7 +73,7 @@ class SynonymGetTestCase(BaseTestGenerator): str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/' + str(self.syn_oid), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """ Disconnect the database. """ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_put.py index b9faa7087..97eaf087b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/test_synonym_put.py @@ -99,7 +99,7 @@ class SynonymPutTestCase(BaseTestGenerator): str(self.syn_oid), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """ Disconnect the database. """ 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 fa8e68464..5f0e6b3d1 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 @@ -102,7 +102,7 @@ class ColumnMsqlTestCase(BaseTestGenerator): expected_precision = self.data["old_precision"] expected_sql = (eval(self.expected_data["test_result_data"])) - self.assertEquals(response_data['data'], expected_sql) + self.assertEqual(response_data['data'], expected_sql) def tearDown(self): # Disconnect the database 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 cce634d5d..a574eacd9 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 @@ -116,7 +116,7 @@ class CompoundTriggersAddTestCase(BaseTestGenerator): with patch(self.mock_data["function_name"], side_effect=eval(self.mock_data["return_value"])): response = self.create_compound_trigger(object_id) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 6f25444c4..7ce060f02 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 @@ -102,7 +102,7 @@ class CompoundTriggersDeleteTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.delete_compound_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 062456f2f..95f1dcf98 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 @@ -110,7 +110,7 @@ class CompoundTriggersDeleteMultipleTestCase(BaseTestGenerator): if self.is_positive_test: response = self.delete_multiple_compound_triggers(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): 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 be389dcdd..1448a456f 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 @@ -110,7 +110,7 @@ class CompoundTriggersGetTestCase(BaseTestGenerator): url + \ "?oid=17312&description=commaa&name=code&_=1589522392579" response = self.tester.get(url, follow_redirects=True) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) if hasattr(self, "table_nodes"): self.trigger_id = '' @@ -137,7 +137,7 @@ class CompoundTriggersGetTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.get_compound_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 349856b11..dee22c090 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 @@ -135,7 +135,7 @@ class CompoundTriggersUpdateTestCase(BaseTestGenerator): self.trigger_id = 9999 response = self.update_compound_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 87f46b88a..2932bcf35 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 @@ -146,7 +146,7 @@ def api_get_index_msql(self): def assert_status_code(self, response): act_res = response.status_code exp_res = self.expected_data["status_code"] - return self.assertEquals(act_res, exp_res) + return self.assertEqual(act_res, exp_res) def assert_error_message(self, response, error_msg=None): @@ -155,7 +155,7 @@ def assert_error_message(self, response, error_msg=None): exp_res = error_msg else: exp_res = self.expected_data["error_msg"] - return self.assertEquals(act_res, exp_res) + return self.assertEqual(act_res, exp_res) def create_index(server, db_name, schema_name, table_name, index_name, 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 6e64377b4..36e517d6e 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 @@ -83,7 +83,7 @@ class RulesAddTestCase(BaseTestGenerator): with patch(self.mock_data["function_name"], side_effect=eval(self.mock_data["return_value"])): response = self.create_policy(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def create_policy(self, data): 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 7639f97ed..9ac2627ac 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 @@ -79,7 +79,7 @@ class PolicyDeleteTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.delete_policy() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete_multiple.py index d8d76ff6f..74ed682c6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/test_rls_delete_multiple.py @@ -86,7 +86,7 @@ class PolicyDeleteTestCases(BaseTestGenerator): data = {'ids': self.rule_ids} if self.is_positive_test: response = self.delete_multiple_policy(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 09eb613f5..21ebc1202 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 @@ -86,7 +86,7 @@ class PolicyGetTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.get_policy() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 2e6c6d97c..7f140d475 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 @@ -97,7 +97,7 @@ class PolicyUpdateTestCase(BaseTestGenerator): self.policy_id = 9999 response = self.update_policy(self.test_data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 51a816762..92b0474bd 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 @@ -75,7 +75,7 @@ class RulesAddTestCase(BaseTestGenerator): with patch(self.mock_data["function_name"], side_effect=eval(self.mock_data["return_value"])): response = self.create_rule(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def create_rule(self, data): 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 aee667bd8..1395ac69a 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 @@ -79,7 +79,7 @@ class RulesDeleteTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.delete_rules() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py index f23a101a8..97f543161 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/tests/test_rules_delete_multiple.py @@ -86,7 +86,7 @@ class RulesDeleteTestCase(BaseTestGenerator): data = {'ids': self.rule_ids} if self.is_positive_test: response = self.delete_multiple_rule(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 37aa62cba..73136ba83 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 @@ -86,7 +86,7 @@ class RulesGetTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.get_rule() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 f90658418..824aebbae 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 @@ -85,7 +85,7 @@ class RulesUpdateTestCase(BaseTestGenerator): self.rule_id = 9999 response = self.update_rule(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_privileges_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_privileges_put.py index 2a26a61ce..a4323c32d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_privileges_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_privileges_put.py @@ -89,7 +89,7 @@ class TableUpdateColumnTestCase(BaseTestGenerator): str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/' + str(self.table_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_add.py index f0656e523..fb17fd805 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_add.py @@ -247,7 +247,7 @@ class TableAddTestCase(BaseTestGenerator): '/' + str(self.schema_id) + '/', data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete.py index 9ebdcac1b..62471253c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete.py @@ -59,7 +59,7 @@ class TableDeleteTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(self.table_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py index f3adfb155..76baec78f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_delete_multiple.py @@ -73,7 +73,7 @@ class TableDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json', follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_get.py index 14a80cd76..b6506cee6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_get.py @@ -55,7 +55,7 @@ class TableGetTestCase(BaseTestGenerator): str(self.schema_id) + '/' + str(self.table_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_parameters.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_parameters.py index fae094bdc..8c8694934 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_parameters.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_parameters.py @@ -168,7 +168,7 @@ class TableUpdateParameterTestCase(BaseTestGenerator): str(self.table_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_put.py index 0ef9e62e8..358c5f6f5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_table_put.py @@ -156,7 +156,7 @@ class TableUpdateTestCase(BaseTestGenerator): str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/' + str(self.table_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 ba52726f1..a2c84ac17 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 @@ -92,7 +92,7 @@ class TriggersAddTestCase(BaseTestGenerator): with patch(self.mock_data["function_name"], side_effect=eval(self.mock_data["return_value"])): response = self.create_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 0186ae206..1bc8d387f 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 @@ -90,7 +90,7 @@ class TriggersDeleteTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.delete_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py index 135421660..729cc8480 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/test_triggers_delete_multiple.py @@ -95,7 +95,7 @@ class TriggersDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database 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 25e1eff4f..f5fa5dee8 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 @@ -92,7 +92,7 @@ class TriggersGetTestCase(BaseTestGenerator): "?oid=17312&description=commaa&name=code&_=1589522392579" response = self.tester.get(url, follow_redirects=True) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) if hasattr(self, "table_nodes"): self.trigger_id = '' @@ -119,7 +119,7 @@ class TriggersGetTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.get_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): 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 995a3fc55..44199d925 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 @@ -112,7 +112,7 @@ class TriggersUpdateTestCase(BaseTestGenerator): self.trigger_id = 9999 response = self.update_trigger() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data["status_code"]) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_add.py index bf55c3797..37ca1b47f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_add.py @@ -95,7 +95,7 @@ class SchemaAddTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete.py index 5f1f8b77d..e419aa378 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete.py @@ -79,7 +79,7 @@ class SchemaDeleteTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py index e8fc84dd3..bea75a0ff 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_delete_multiple.py @@ -81,7 +81,7 @@ class SchemaDeleteMultipleTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_dependents.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_dependents.py index f40ed994a..1052407dd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_dependents.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_dependents.py @@ -70,7 +70,7 @@ class SchemaDependentAndDependencyTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get.py index 2ae44b9ef..f21e7906d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get.py @@ -80,7 +80,7 @@ class SchemaGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get_children.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get_children.py index b4d20b523..06cfa7061 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get_children.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_get_children.py @@ -77,7 +77,7 @@ class SchemaChildrenTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_node.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_node.py index 650d0f0a0..dcd263907 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_node.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_node.py @@ -79,7 +79,7 @@ class SchemaNodeAndNodesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_put.py index ed2385cc7..30a6562aa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_put.py @@ -151,7 +151,7 @@ class SchemaPutTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_sql.py index d73556810..a75eb031d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tests/test_schema_sql.py @@ -81,7 +81,7 @@ class SchemaSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_add.py index 7b7c8c2d8..988f1e550 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_add.py @@ -80,7 +80,7 @@ class TypesAddTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.create_types() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete.py index 9b55e6abb..fcb8db2c9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete.py @@ -86,7 +86,7 @@ class TypesDeleteTestCase(BaseTestGenerator): self.type_id = 99999 response = self.delete_type() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete_multiple.py index a16ddbc31..60a50f5e9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_delete_multiple.py @@ -81,7 +81,7 @@ class TypesDeleteMultipleTestCase(BaseTestGenerator): if self.is_positive_test: response = self.delete_multiple(data) - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_dependency_dependent.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_dependency_dependent.py index 4b02d8a0d..fa5897f52 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_dependency_dependent.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_dependency_dependent.py @@ -61,7 +61,7 @@ class TypesDependenciesTestCase(BaseTestGenerator): ) expected_response_code = self.expected_data['status_code'] - self.assertEquals(response.status_code, expected_response_code) + self.assertEqual(response.status_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get.py index 391684996..ed2a4843f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get.py @@ -99,7 +99,7 @@ class TypesGetTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_collations.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_collations.py index ddd2639ff..6492f92a1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_collations.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_collations.py @@ -75,7 +75,7 @@ class TypesGetCollationsTestCase(BaseTestGenerator): return_value=eval(self.mock_data["return_value"])): response = self.get_collations() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_external_functions.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_external_functions.py index 29313fb28..635ed9afa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_external_functions.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_external_functions.py @@ -77,7 +77,7 @@ class TypesExternalFunctionTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.get_external_function() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes.py index 4b570873b..6c0b0fc5b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes.py @@ -76,7 +76,7 @@ class TypesSubTypesTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.get_subtypes() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes_opclass.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes_opclass.py index bdfaa4ed4..73c92f466 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes_opclass.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_stypes_opclass.py @@ -68,7 +68,7 @@ class TypesSubTypesOpClassTestCase(BaseTestGenerator): if self.is_positive_test: response = self.get_subtypes_opclass() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_subtype_diff.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_subtype_diff.py index ad17cd436..73461a8d3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_subtype_diff.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_subtype_diff.py @@ -68,7 +68,7 @@ class TypesSubTypeDiffTestCase(BaseTestGenerator): if self.is_positive_test: response = self.get_subtype_diff() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_types.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_types.py index be4da66b4..57bd736cf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_types.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_get_types.py @@ -76,7 +76,7 @@ class TypesGetTypesTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.get_types() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_msql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_msql.py index f91a9f101..bbfcbd2fa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_msql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_msql.py @@ -68,7 +68,7 @@ class TypesMSQLTestCase(BaseTestGenerator): if self.is_positive_test: response = self.msql_type() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_nodes.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_nodes.py index 6c7c998a3..5ffee5c5e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_nodes.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_nodes.py @@ -95,7 +95,7 @@ class TypesNodesTestCase(BaseTestGenerator): self.type_id = 99999 response = self.get_type_node() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_put.py index 449653be0..cd708876d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_put.py @@ -79,7 +79,7 @@ class TypesUpdateTestCase(BaseTestGenerator): side_effect=[return_value_object]): response = self.update_type() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_sql.py index 8af9e2c5a..2d78eeb35 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/test_types_sql.py @@ -80,7 +80,7 @@ class TypesSQLTestCase(BaseTestGenerator): self.type_id = 99999 response = self.sql_type() - self.assertEquals(response.status_code, + self.assertEqual(response.status_code, self.expected_data['status_code']) def tearDown(self): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_parameters.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_parameters.py index 9f9a3898d..47a3c6ed7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_parameters.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_parameters.py @@ -181,7 +181,7 @@ class MViewsUpdateParameterTestCase(BaseTestGenerator): str(self.m_view_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_refresh.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_refresh.py index 3b4055f30..f54a47a5f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_refresh.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_mviews_refresh.py @@ -115,7 +115,7 @@ class MViewsUpdateParameterTestCase(BaseTestGenerator): str(self.m_view_id), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) if is_put_request and response.json['success'] == 0: self.skipTest( "Couldn't check materialized view refresh" @@ -136,9 +136,9 @@ class MViewsUpdateParameterTestCase(BaseTestGenerator): follow_redirects=True ) if self.type == 'invalid': - self.assertEquals(response.status_code, 410) + self.assertEqual(response.status_code, 410) else: - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # On success we get job_id from server self.assertTrue('job_id' in response.json['data']) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_add.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_add.py index af911d4e9..a582c6076 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_add.py @@ -96,7 +96,7 @@ class ViewsAddTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/' + str(self.db_id) + '/' + str(self.schema_id) + '/', data=json.dumps(self.data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete.py index bcc22c8f8..7b6ff7a81 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete.py @@ -80,7 +80,7 @@ class ViewsDeleteTestCase(BaseTestGenerator): ), follow_redirects=True ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py index 6a22a7157..4c33b0a7a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_delete_multiple.py @@ -97,7 +97,7 @@ class ViewsDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get.py index 71279127b..5f5d7a991 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_get.py @@ -76,7 +76,7 @@ class ViewsGetTestCase(BaseTestGenerator): ), follow_redirects=True ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_put.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_put.py index f99a7972d..5a68040b6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/test_views_put.py @@ -84,7 +84,7 @@ class ViewsUpdateTestCase(BaseTestGenerator): ), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): # Disconnect the database diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py index fc62bed38..a8f92e5da 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_add.py @@ -40,7 +40,7 @@ class DatabaseAddTestCase(BaseTestGenerator): "/" + str(self.server_id) + "/", data=json.dumps(self.data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) db_id = response_data['node']['_id'] db_dict = {"server_id": self.server_id, "db_id": db_id, diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py index 22225b968..cda78b74c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete.py @@ -39,7 +39,7 @@ class DatabaseDeleteTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/' + str(db_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) else: raise Exception("Could not connect to server to delete the " "database.") diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py index 51e477603..bf14e757e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_delete_multiple.py @@ -44,7 +44,7 @@ class DatabaseMultipleDeleteTestCase(BaseTestGenerator): follow_redirects=True, data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) else: raise Exception("Could not connect to server to delete the " "database.") diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py index dd314154e..8f8d3c63e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_get.py @@ -37,7 +37,7 @@ class DatabasesGetTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str( server_id) + '/' + str(db_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) else: raise Exception("Could not connect to database.") except Exception as exception: diff --git a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py index 0a40d79fb..bbf0f8afd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py +++ b/web/pgadmin/browser/server_groups/servers/databases/tests/test_db_put.py @@ -49,7 +49,7 @@ class DatabasesUpdateTestCase(BaseTestGenerator): self.server_id) + '/' + str(self.db_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) except Exception as exception: from traceback import print_exc print_exc() diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_add.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_add.py index 8c19506f4..57d27a611 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_add.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_add.py @@ -76,7 +76,7 @@ class PgAgentAddTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data) self.job_id = response_data['node']['_id'] diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete.py index 4e7ef9a80..53a564479 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete.py @@ -38,7 +38,7 @@ class PgAgentDeleteTestCase(BaseTestGenerator): ), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) is_present = pgagent_utils.verify_pgagent_job(self) self.assertFalse( is_present, "pgAgent job was not deleted successfully" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete_multiple.py index 89b1f6dc4..9d4c6de85 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_delete_multiple.py @@ -41,7 +41,7 @@ class PgAgentDeleteMultipleTestCase(BaseTestGenerator): data=json.dumps({'ids': [self.job_id1, self.job_id2]}), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_put.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_put.py index dc55dda39..1054acc4a 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_put.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_put.py @@ -113,7 +113,7 @@ class PgAgentPutTestCase(BaseTestGenerator): follow_redirects=True, content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_schedule.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_schedule.py index ab8da587e..607a9d99a 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_schedule.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_schedule.py @@ -66,7 +66,7 @@ class PgAgentAddScheduleTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data) self.schedule_id = response_data['node']['_id'] diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_steps.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_steps.py index e0f3dfdac..c56696601 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_steps.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_add_steps.py @@ -55,7 +55,7 @@ class PgAgentAddStepTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data) self.step_id = response_data['node']['_id'] diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_schedules.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_schedules.py index 5398fe96a..8cf106ff7 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_schedules.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_schedules.py @@ -49,7 +49,7 @@ class PgAgentDeleteMultipleSchedulesTestCase(BaseTestGenerator): data=json.dumps({'ids': [self.schedule_id1, self.schedule_id2]}), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_steps.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_steps.py index 3290557e7..a1486a41a 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_steps.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_multiple_steps.py @@ -47,7 +47,7 @@ class PgAgentDeleteMultipleStepsTestCase(BaseTestGenerator): data=json.dumps({'ids': [self.step_id1, self.step_id2]}), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_schedule.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_schedule.py index e08ea49ab..dbbc16105 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_schedule.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_schedule.py @@ -41,7 +41,7 @@ class PgAgentDeleteScheduleTestCase(BaseTestGenerator): ), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) is_present = pgagent_utils.verify_pgagent_schedule(self) self.assertFalse( is_present, "pgAgent schedule was not deleted successfully" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_steps.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_steps.py index 9ca26268e..20cb83552 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_steps.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_delete_steps.py @@ -41,7 +41,7 @@ class PgAgentDeleteStepTestCase(BaseTestGenerator): ), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) is_present = pgagent_utils.verify_pgagent_step(self) self.assertFalse( is_present, "pgAgent step was not deleted successfully" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_get.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_get.py index 99ec4b267..e0af5c548 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_get.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_get.py @@ -38,7 +38,7 @@ class PgAgentGetTestCase(BaseTestGenerator): ), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_schedule.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_schedule.py index 0e189b6f9..49d460ab7 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_schedule.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_schedule.py @@ -123,7 +123,7 @@ class PgAgentPutScheduleTestCase(BaseTestGenerator): data=json.dumps(self.data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_step.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_step.py index f01d23bf3..09921af93 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_step.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_put_step.py @@ -59,7 +59,7 @@ class PgAgentPutStepTestCase(BaseTestGenerator): data=json.dumps(self.data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_stats.py b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_stats.py index 5428a1cc1..91a2a2175 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_stats.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/tests/tests_pgagent_stats.py @@ -38,7 +38,7 @@ class PgAgentStatsTestCase(BaseTestGenerator): ), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """Clean up code""" diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_add.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_add.py index 913414e8d..e3f8eaffe 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_add.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_add.py @@ -50,7 +50,7 @@ class ResourceGroupsAddTestCase(BaseTestGenerator): "/" + str(self.server_id) + "/", data=json.dumps(data), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the resource group from the database.""" diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py index 8ea87e518..0fa6730da 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete.py @@ -52,7 +52,7 @@ class ResourceGroupsDeleteTestCase(BaseTestGenerator): "{0}{1}/{2}/{3}".format(self.url, utils.SERVER_GROUP, self.server_id, self.resource_group_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the resource group from the database.""" diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py index 542593e4c..5b1ae503d 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_delete_multiple.py @@ -70,7 +70,7 @@ class ResourceGroupsDeleteTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the resource group from the database.""" diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py index 10c3aa2db..a1241baf1 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/test_resource_groups_put.py @@ -57,7 +57,7 @@ class ResourceGroupsPutTestCase(BaseTestGenerator): self.url, utils.SERVER_GROUP, self.server_id, self.resource_group_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the resource group from the database.""" diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py index a92a4fc2e..01355bb04 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/tests_resource_groups_get.py @@ -52,7 +52,7 @@ class ResourceGroupsGetTestCase(BaseTestGenerator): "{0}{1}/{2}/{3}".format(self.url, utils.SERVER_GROUP, self.server_id, self.resource_group_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the resource group from the database.""" diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_add.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_add.py index 0098ff0a3..7a30435e9 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_add.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_add.py @@ -41,7 +41,7 @@ class LoginRoleAddTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) role_id = response_data['node']['_id'] role_dict = {"server_id": server_id, "role_id": role_id, diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py index c10856134..7d6f20c15 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete.py @@ -36,7 +36,7 @@ class LoginRoleDeleteTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/' + str(self.role_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the role from added server""" diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py index 39f6e5ec8..00c3ff726 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_delete_multiple.py @@ -43,7 +43,7 @@ class LoginRoleDeleteTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json', follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the role from added server""" diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py index d57d1e6b2..c9316bef7 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_get.py @@ -36,7 +36,7 @@ class LoginRoleGetTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/' + str(self.role_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the role from added server""" diff --git a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py index 18ad56d0a..03f6e095a 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py +++ b/web/pgadmin/browser/server_groups/servers/roles/tests/test_role_put.py @@ -45,7 +45,7 @@ class LoginRolePutTestCase(BaseTestGenerator): str(self.server_id) + '/' + str(self.role_id), data=json.dumps(data), follow_redirects=True) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """This function delete the role from added server""" diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py index 081d57699..e87c9229c 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_backend_supported.py @@ -43,6 +43,6 @@ class BackendSupportedTestCase(BaseTestGenerator): manager = MagicMock() manager.sversion = self.manager['sversion'] manager.server_type = self.manager['server_type'] - self.assertEquals( + self.assertEqual( self.expected_result, module.backend_supported(manager) ) 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 378923791..807781aa4 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 @@ -50,7 +50,7 @@ class TableSpaceAddTestCase(BaseTestGenerator): data=json.dumps(data), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) tablespace_id = response_data['node']['_id'] tablespace_dict = {"tablespace_id": tablespace_id, 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 1b4459171..ee0d4c43b 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 @@ -54,9 +54,9 @@ class TableSpaceDeleteTestCase(BaseTestGenerator): '/' + str(self.server_id) + '/' + str(self.tablespace_id), follow_redirects=True ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) delete_response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(delete_response_data['success'], 1) + self.assertEqual(delete_response_data['success'], 1) def tearDown(self): """This function deletes the tablespace""" diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py index f6a7fa407..39922424e 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_get.py @@ -54,7 +54,7 @@ class TablespaceGetTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id) + '/' + str(self.tablespace_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the tablespace from added server""" diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py index 8c0252689..d1c4bd872 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/tests/test_tbspc_put.py @@ -57,7 +57,7 @@ class TableSpaceUpdateTestCase(BaseTestGenerator): data=json.dumps(data), follow_redirects=True ) - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """This function deletes the tablespace""" diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py index cce03041a..94d555617 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_connect_timeout.py @@ -38,7 +38,7 @@ class ServersWithConnectTimeoutAddTestCase(BaseTestGenerator): data=json.dumps(self.server), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.server_id = response_data['node']['_id'] diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_service_id.py b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_service_id.py index 9d8da94fd..9b4d4d377 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_service_id.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_service_id.py @@ -38,7 +38,7 @@ class ServersWithServiceIDAddTestCase(BaseTestGenerator): data=json.dumps(self.server), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.server_id = response_data['node']['_id'] diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_ssh_tunnel.py b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_ssh_tunnel.py index e8b48c0fc..7c0b005d9 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_ssh_tunnel.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_add_server_with_ssh_tunnel.py @@ -73,7 +73,7 @@ class ServersWithSSHTunnelAddTestCase(BaseTestGenerator): data=json.dumps(self.server), content_type='html/json' ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.server_id = response_data['node']['_id'] diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py b/web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py index 3f212f37a..785fbd5c7 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_check_ssl_connection.py @@ -31,7 +31,7 @@ class TestSSLConnection(BaseTestGenerator): connection.commit() cursor.execute("SELECT ssl_is_used()") is_ssl_used = cursor.fetchone()[0] - self.assertEquals(True, is_ssl_used) + self.assertEqual(True, is_ssl_used) else: self.skipTest( 'Cannot run SSL connection check test ' diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_is_valid_address.py b/web/pgadmin/browser/server_groups/servers/tests/test_is_valid_address.py index 05dc6da9e..48ce02754 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_is_valid_address.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_is_valid_address.py @@ -32,7 +32,7 @@ class IsValidAddressTestCase(BaseTestGenerator): pass def runTest(self): - self.assertEquals(utils.is_valid_ipaddress(self.address), + self.assertEqual(utils.is_valid_ipaddress(self.address), self.respdata) @classmethod diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py index 7fe3cf6a8..8444e1d72 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_add.py @@ -29,7 +29,7 @@ class ServersAddTestCase(BaseTestGenerator): url = "{0}{1}/".format(self.url, utils.SERVER_GROUP) response = self.tester.post(url, data=json.dumps(self.server), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.server_id = response_data['node']['_id'] server_dict = {"server_id": int(self.server_id)} @@ -68,7 +68,7 @@ class AddServersWithSavePasswordTestCase(BaseTestGenerator): response = self.tester.post(url, data=json.dumps(_server), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.server_id = response_data['node']['_id'] server_dict = {"server_id": int(self.server_id)} @@ -77,7 +77,7 @@ class AddServersWithSavePasswordTestCase(BaseTestGenerator): str(utils.SERVER_GROUP) + '/' + str(self.server_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) self.assertTrue('is_password_saved' in response.json['result']) utils.write_node_info("sid", server_dict) diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py index c2b184295..30917bd3c 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_delete.py @@ -32,7 +32,7 @@ class ServerDeleteTestCase(BaseTestGenerator): raise Exception("No server to delete!!!") # Call API to delete the servers response = self.tester.delete(url + str(self.server_id)) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the server from SQLite """ diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py index 9f92ffcce..0b4dc183b 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_get.py @@ -37,7 +37,7 @@ class ServersGetTestCase(BaseTestGenerator): response = self.tester.get(self.url + str(utils.SERVER_GROUP) + '/' + str(server_id), follow_redirects=True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def tearDown(self): """This function delete the server from SQLite """ diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py b/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py index 8a69558e9..31c7a476e 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_server_put.py @@ -36,7 +36,7 @@ class ServerUpdateTestCase(BaseTestGenerator): self.url + str(utils.SERVER_GROUP) + '/' + str(self.server_id), data=json.dumps(data), content_type='html/json') - self.assertEquals(put_response.status_code, 200) + self.assertEqual(put_response.status_code, 200) def tearDown(self): """This function delete the server from SQLite""" diff --git a/web/pgadmin/browser/tests/test_change_password.py b/web/pgadmin/browser/tests/test_change_password.py index fb86e4dfd..bbc81c685 100644 --- a/web/pgadmin/browser/tests/test_change_password.py +++ b/web/pgadmin/browser/tests/test_change_password.py @@ -108,7 +108,7 @@ class ChangePasswordTestCase(BaseTestGenerator): # Logout the Administrator before login normal user self.tester.logout() response = self.tester.login(self.username, self.password, True) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # test the 'change password' test case utils.change_password(self) # Delete the normal user after changing it's password @@ -119,7 +119,7 @@ class ChangePasswordTestCase(BaseTestGenerator): '/user_management/user/' + str(user_id), follow_redirects=True ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) else: utils.change_password(self) diff --git a/web/pgadmin/browser/tests/test_master_password.py b/web/pgadmin/browser/tests/test_master_password.py index 5812b4dea..8d9be6326 100644 --- a/web/pgadmin/browser/tests/test_master_password.py +++ b/web/pgadmin/browser/tests/test_master_password.py @@ -73,23 +73,23 @@ class MasterPasswordTestCase(BaseTestGenerator): data=json.dumps(req_data), ) - self.assertEquals(response.json['data']['present'], True) + self.assertEqual(response.json['data']['present'], True) else: if 'reset' in req_data: response = self.tester.delete( '/browser/master_password' ) - self.assertEquals(response.status_code, 200) - self.assertEquals(response.json['data'], False) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.json['data'], False) else: response = self.tester.post( '/browser/master_password', data=json.dumps(req_data), ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) if hasattr(self, 'content'): - self.assertEquals(response.json['data']['title'], + self.assertEqual(response.json['data']['title'], self.content[0]) for text in self.content[1]: @@ -99,8 +99,8 @@ class MasterPasswordTestCase(BaseTestGenerator): response = self.tester.get( '/browser/master_password' ) - self.assertEquals(response.status_code, 200) - self.assertEquals(response.json['data'], True) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.json['data'], True) def tearDown(self): config.MASTER_PASSWORD_REQUIRED = False diff --git a/web/pgadmin/dashboard/tests/test_dashboard_graphs.py b/web/pgadmin/dashboard/tests/test_dashboard_graphs.py index 0baf02b48..043fcf23c 100644 --- a/web/pgadmin/dashboard/tests/test_dashboard_graphs.py +++ b/web/pgadmin/dashboard/tests/test_dashboard_graphs.py @@ -92,17 +92,17 @@ class DashboardGraphsTestCase(BaseTestGenerator): url = self.getStatsUrl(self.server_id, self.did, ",".join(self.chart_data.keys())) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) resp_data = json.loads(response.data) # All requested charts received - self.assertEquals(len(resp_data.keys()), + self.assertEqual(len(resp_data.keys()), len(self.chart_data.keys())) # All requested charts data received for chart_name, chart_vals in self.chart_data.items(): - self.assertEquals(set(resp_data[chart_name].keys()), + self.assertEqual(set(resp_data[chart_name].keys()), set(chart_vals)) else: 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 797e5bb87..f0fe6db15 100644 --- a/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py +++ b/web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py @@ -91,7 +91,7 @@ class PGUtilitiesBackupFeatureTest(BaseFeatureTest): ".loading-logs"), 10) expected_backup_success_msg = "Successfully completed." - self.assertEquals(status, expected_backup_success_msg) + self.assertEqual(status, expected_backup_success_msg) backup_file = None # Check for XSS in Backup details @@ -135,7 +135,7 @@ class PGUtilitiesBackupFeatureTest(BaseFeatureTest): self.page.wait_for_element_to_disappear( lambda driver: driver.find_element_by_css_selector( ".loading-logs"), 10) - self.assertEquals(status, expected_backup_success_msg) + self.assertEqual(status, expected_backup_success_msg) # Check for XSS in Restore details if self.is_xss_check: diff --git a/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py b/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py index 173723a3b..1147b2444 100644 --- a/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py +++ b/web/pgadmin/feature_tests/pg_utilities_maintenance_test.py @@ -137,14 +137,14 @@ class PGUtilitiesMaintenanceFeatureTest(BaseFeatureTest): ) if status != "Successfully completed.": - self.assertEquals(status, "Successfully completed.") + self.assertEqual(status, "Successfully completed.") command = self.page.find_by_css_selector( NavMenuLocators. process_watcher_detailed_command_canvas_css).text if self.test_level == 'database': - self.assertEquals(command, "VACUUM (VERBOSE)\nRunning Query:" + self.assertEqual(command, "VACUUM (VERBOSE)\nRunning Query:" "\nVACUUM VERBOSE;") elif self.is_xss_check and self.test_level == 'table': # Check for XSS in the dialog @@ -158,7 +158,7 @@ class PGUtilitiesMaintenanceFeatureTest(BaseFeatureTest): 'Maintenance detailed window' ) else: - self.assertEquals(command, "VACUUM " + self.assertEqual(command, "VACUUM " "(VERBOSE)\nRunning Query:" "\nVACUUM VERBOSE" " public." + self.table_name + ";") diff --git a/web/pgadmin/feature_tests/view_data_dml_queries.py b/web/pgadmin/feature_tests/view_data_dml_queries.py index 663289fe2..2be43d25e 100644 --- a/web/pgadmin/feature_tests/view_data_dml_queries.py +++ b/web/pgadmin/feature_tests/view_data_dml_queries.py @@ -339,7 +339,7 @@ CREATE TABLE public.nonintpkey def _verify_messsages(self, text): messages_ele = self.page.find_by_css_selector( QueryToolLocators.query_messages_panel) - self.assertEquals(text, messages_ele.text) + self.assertEqual(text, messages_ele.text) def _verify_row_data(self, row_height, config_check_data): self.page.click_execute_query_button() @@ -369,7 +369,7 @@ CREATE TABLE public.nonintpkey print("stale reference exception at id:", idx) retry -= 1 time.sleep(0.4) - self.assertEquals(element.text, config_check_data[str(idx)][1]) + self.assertEqual(element.text, config_check_data[str(idx)][1]) # scroll browser back to the left # to reset position so other assertions can succeed diff --git a/web/pgadmin/tools/backup/tests/test_check_utility_exists_route_backup.py b/web/pgadmin/tools/backup/tests/test_check_utility_exists_route_backup.py index da71fe16e..b4f6ac183 100644 --- a/web/pgadmin/tools/backup/tests/test_check_utility_exists_route_backup.py +++ b/web/pgadmin/tools/backup/tests/test_check_utility_exists_route_backup.py @@ -33,6 +33,6 @@ class TestUtilityCheckRouteCase(BaseTestGenerator): does_utility_exist_mock.return_value = False server_id = self.server_information['server_id'] response = self.tester.get(self.url.format(server_id)) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response = json.loads(response.data.decode('utf-8')) - self.assertEquals(self.expected_success_value, response['success']) + self.assertEqual(self.expected_success_value, response['success']) diff --git a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_acl.py b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_acl.py index 249bd3f21..65903fba4 100644 --- a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_acl.py +++ b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_acl.py @@ -54,7 +54,7 @@ class GrantWizardSaveGetACLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect database.""" diff --git a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_properties.py b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_properties.py index 1aa2c2c1b..3b7a7c41a 100644 --- a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_properties.py +++ b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_properties.py @@ -85,7 +85,7 @@ class GrantWizardSaveGetPropertiesTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect database.""" diff --git a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_sql.py b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_sql.py index 6cc95b49b..a4aacfd3f 100644 --- a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_sql.py +++ b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_get_sql.py @@ -89,7 +89,7 @@ class GrantWizardSaveGetSQLTestCase(BaseTestGenerator): actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect database.""" diff --git a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_save_permissions.py b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_save_permissions.py index 30a785276..27fa831dc 100644 --- a/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_save_permissions.py +++ b/web/pgadmin/tools/grant_wizard/tests/test_grant_wizard_save_permissions.py @@ -86,7 +86,7 @@ class GrantWizardSavePermissionsTestCase(BaseTestGenerator): response = self.grant_permissions() actual_response_code = response.status_code expected_response_code = self.expected_data['status_code'] - self.assertEquals(actual_response_code, expected_response_code) + self.assertEqual(actual_response_code, expected_response_code) def tearDown(self): """This function disconnect database.""" diff --git a/web/pgadmin/tools/import_export/tests/test_check_utility_exists_route_import_export.py b/web/pgadmin/tools/import_export/tests/test_check_utility_exists_route_import_export.py index d8f3abddf..2895097e2 100644 --- a/web/pgadmin/tools/import_export/tests/test_check_utility_exists_route_import_export.py +++ b/web/pgadmin/tools/import_export/tests/test_check_utility_exists_route_import_export.py @@ -32,6 +32,6 @@ class TestUtilityCheckRouteCase(BaseTestGenerator): does_utility_exist_mock.return_value = False server_id = self.server_information['server_id'] response = self.tester.get(self.url.format(server_id)) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response = json.loads(response.data.decode('utf-8')) - self.assertEquals(self.expected_success_value, response['success']) + self.assertEqual(self.expected_success_value, response['success']) diff --git a/web/pgadmin/tools/maintenance/tests/test_check_utility_exists_route_maintenance.py b/web/pgadmin/tools/maintenance/tests/test_check_utility_exists_route_maintenance.py index 4388f5ef4..5fa80a3c2 100644 --- a/web/pgadmin/tools/maintenance/tests/test_check_utility_exists_route_maintenance.py +++ b/web/pgadmin/tools/maintenance/tests/test_check_utility_exists_route_maintenance.py @@ -32,6 +32,6 @@ class TestUtilityCheckRouteCase(BaseTestGenerator): does_utility_exist_mock.return_value = False server_id = self.server_information['server_id'] response = self.tester.get(self.url.format(server_id)) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response = json.loads(response.data.decode('utf-8')) - self.assertEquals(self.expected_success_value, response['success']) + self.assertEqual(self.expected_success_value, response['success']) diff --git a/web/pgadmin/tools/restore/tests/test_check_utility_exists_route_restore.py b/web/pgadmin/tools/restore/tests/test_check_utility_exists_route_restore.py index 6f61df8c2..bb0ef2e44 100644 --- a/web/pgadmin/tools/restore/tests/test_check_utility_exists_route_restore.py +++ b/web/pgadmin/tools/restore/tests/test_check_utility_exists_route_restore.py @@ -32,6 +32,6 @@ class TestUtilityCheckRouteCase(BaseTestGenerator): does_utility_exist_mock.return_value = False server_id = self.server_information['server_id'] response = self.tester.get(self.url.format(server_id)) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response = json.loads(response.data.decode('utf-8')) - self.assertEquals(self.expected_success_value, response['success']) + self.assertEqual(self.expected_success_value, response['success']) diff --git a/web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py b/web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py index 088829d1e..a856122ac 100644 --- a/web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py +++ b/web/pgadmin/tools/schema_diff/tests/test_schema_diff_comp.py @@ -109,14 +109,14 @@ class SchemaDiffTestCase(): response = self.tester.get(comp_url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) return json.loads(response.data.decode('utf-8')) def runTest(self): """ This function will test the schema diff.""" response = self.tester.get("schema_diff/initialize") - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.trans_id = response_data['data']['schemaDiffTransId'] @@ -162,7 +162,7 @@ class SchemaDiffTestCase(): response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) file_obj.write(response_data['diff_ddl']) elif 'diff_ddl' in diff: @@ -178,7 +178,7 @@ class SchemaDiffTestCase(): response_data = self.compare() for diff in response_data['data']: if diff['type'] in self.nodes: - self.assertEquals(diff['status'], 'Identical') + self.assertEqual(diff['status'], 'Identical') except Exception as e: os.remove(diff_file) 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 f12e9865e..cf10c997b 100644 --- a/web/pgadmin/tools/search_objects/tests/test_api_search.py +++ b/web/pgadmin/tools/search_objects/tests/test_api_search.py @@ -37,7 +37,7 @@ class SearchObjectsApiSearch(BaseTestGenerator): url_params = urlencode(url_params) response = self.tester.get(self.base_url + '?' + url_params) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def runTest(self): database_info = parent_node_dict["database"][-1] @@ -61,7 +61,7 @@ class SearchObjectsApiSearch(BaseTestGenerator): types_url = '/search_objects/types/' +\ str(server_id) + '/' + str(db_id) response = self.tester.get(types_url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) types_data = json.loads(response.data.decode('utf-8'))['data'] for a_type in types_data: diff --git a/web/pgadmin/tools/search_objects/tests/test_api_types.py b/web/pgadmin/tools/search_objects/tests/test_api_types.py index aed5571ad..902456735 100644 --- a/web/pgadmin/tools/search_objects/tests/test_api_types.py +++ b/web/pgadmin/tools/search_objects/tests/test_api_types.py @@ -36,11 +36,11 @@ class SearchObjectsApiTypes(BaseTestGenerator): url = self.url + '/' + str(server_id) + '/' + str(db_id) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # repsonse data should be dict response_data = json.loads(response.data.decode('utf-8'))['data'] - self.assertEquals(type(response_data), dict) + self.assertEqual(type(response_data), dict) # response data key values should not be None for key, value in response_data.items(): diff --git a/web/pgadmin/tools/search_objects/tests/test_search_objects_helper.py b/web/pgadmin/tools/search_objects/tests/test_search_objects_helper.py index 810a7f0c5..2b112b573 100644 --- a/web/pgadmin/tools/search_objects/tests/test_search_objects_helper.py +++ b/web/pgadmin/tools/search_objects/tests/test_search_objects_helper.py @@ -104,17 +104,17 @@ class SearchObjectsHelperTest(BaseTestGenerator): # test template path manager.server_type = 'pg' manager.version = 906000 - self.assertEquals(so_obj.get_template_path(), + self.assertEqual(so_obj.get_template_path(), 'search_objects/sql/pg/#906000#') - self.assertEquals(so_obj.get_show_node_prefs(), + self.assertEqual(so_obj.get_show_node_prefs(), self.expected_show_node_prefs) - self.assertEquals(so_obj.get_supported_types(), + self.assertEqual(so_obj.get_supported_types(), self.expected_supported_types) - self.assertEquals(so_obj.get_supported_types(skip_check=True), + self.assertEqual(so_obj.get_supported_types(skip_check=True), self.expected_supported_types_skip) - self.assertEquals(so_obj.search('searchtext', 'all'), + self.assertEqual(so_obj.search('searchtext', 'all'), self.expected_search_op) diff --git a/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py b/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py index 812058ec4..37ee5f47e 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_download_csv_query_tool.py @@ -119,7 +119,7 @@ class TestDownloadCSV(BaseTestGenerator): url = self.init_url.format( self.trans_id, test_utils.SERVER_GROUP, self._sid, self._did) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # If invalid tx test then make the Tx id invalid so that tests fails if not self.is_valid_tx: @@ -137,7 +137,7 @@ class TestDownloadCSV(BaseTestGenerator): response = self.tester.post(url, data={"query": self.sql}) headers = dict(response.headers) # when valid query - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) csv_data = response.data.decode() self.assertTrue(self.output_columns in csv_data) self.assertTrue(self.output_values in csv_data) @@ -149,7 +149,7 @@ class TestDownloadCSV(BaseTestGenerator): response = self.tester.post(url, data={"query": self.sql}) headers = dict(response.headers) # when valid query - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) csv_data = response.data.decode() self.assertTrue(self.output_columns in csv_data) self.assertTrue(self.output_values in csv_data) @@ -167,7 +167,7 @@ class TestDownloadCSV(BaseTestGenerator): self.app.logger.disabled = False if self.is_valid: # when valid query - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) csv_data = response.data.decode() self.assertTrue(self.output_columns in csv_data) self.assertTrue(self.output_values in csv_data) @@ -175,7 +175,7 @@ class TestDownloadCSV(BaseTestGenerator): self.assertIn(self.filename, headers['Content-Disposition']) elif not self.is_valid and self.is_valid_tx: # When user enters wrong query - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) self.assertFalse(response_data['data']['status']) self.assertTrue( @@ -184,7 +184,7 @@ class TestDownloadCSV(BaseTestGenerator): ) else: # when TX id is invalid - self.assertEquals(response.status_code, 500) + self.assertEqual(response.status_code, 500) database_utils.disconnect_database(self, self._sid, self._did) diff --git a/web/pgadmin/tools/sqleditor/tests/test_editor_history.py b/web/pgadmin/tools/sqleditor/tests/test_editor_history.py index 42b28489e..eb17f4521 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_editor_history.py +++ b/web/pgadmin/tools/sqleditor/tests/test_editor_history.py @@ -73,30 +73,30 @@ class TestEditorHistory(BaseTestGenerator): url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format( self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def runTest(self): url = '/sqleditor/query_history/{0}'.format(self.trans_id) if not self.clear: response = self.tester.post(url, data=self.entry) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(len(response_data['data']['result']), + self.assertEqual(len(response_data['data']['result']), self.expected_len) else: response = self.tester.delete(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(len(response_data['data']['result']), + self.assertEqual(len(response_data['data']['result']), self.expected_len) def tearDown(self): diff --git a/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py b/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py index c70258c05..f734ea1c0 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py +++ b/web/pgadmin/tools/sqleditor/tests/test_encoding_charset.py @@ -260,21 +260,21 @@ class TestEncodingCharset(BaseTestGenerator): .format(self.trans_id, test_utils.SERVER_GROUP, self.encode_sid, self.encode_did) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Check character url = "/sqleditor/query_tool/start/{0}".format(self.trans_id) sql = "select E'{0}';".format(self.test_str) response = self.tester.post(url, data=json.dumps({"sql": sql}), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) url = '/sqleditor/poll/{0}'.format(self.trans_id) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(response_data['data']['rows_fetched_to'], 1) + self.assertEqual(response_data['data']['rows_fetched_to'], 1) result = response_data['data']['result'][0][0] - self.assertEquals(result, self.test_str) + self.assertEqual(result, self.test_str) database_utils.disconnect_database(self, self.encode_sid, self.encode_did) diff --git a/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py b/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py index 8da233938..80ce48bff 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py +++ b/web/pgadmin/tools/sqleditor/tests/test_explain_plan.py @@ -37,7 +37,7 @@ class TestExplainPlan(BaseTestGenerator): url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format( self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Start query tool transaction url = '/sqleditor/query_tool/start/{0}'.format(self.trans_id) @@ -55,17 +55,17 @@ class TestExplainPlan(BaseTestGenerator): } }), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Query tool polling url = '/sqleditor/poll/{0}'.format(self.trans_id) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) # Check the ouput of explain plan - self.assertEquals(len(response_data['data']['result']), 1) - self.assertEquals(len(response_data['data']['result'][0]), 1) + self.assertEqual(len(response_data['data']['result']), 1) + self.assertEqual(len(response_data['data']['result'][0]), 1) # Disconnect the database database_utils.disconnect_database(self, self.server_id, self.db_id) diff --git a/web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py b/web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py index 0d10c94d4..1d9604a19 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py +++ b/web/pgadmin/tools/sqleditor/tests/test_extract_sql_from_network_parameters.py @@ -59,4 +59,4 @@ class ExtractSQLFromNetworkParametersTest(BaseTestGenerator): self.request_form_data ) - self.assertEquals(result, self.expected_result) + self.assertEqual(result, self.expected_result) diff --git a/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py b/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py index 774fb46df..1f6d89a38 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_poll_query_tool.py @@ -80,7 +80,7 @@ NOTICE: Hello, world! url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format( self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) cnt = 0 for s in self.sql: @@ -90,12 +90,12 @@ NOTICE: Hello, world! response = self.tester.post(url, data=json.dumps({"sql": s}), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Query tool polling url = '/sqleditor/poll/{0}'.format(self.trans_id) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) if self.expected_message[cnt] is not None: @@ -104,7 +104,7 @@ NOTICE: Hello, world! response_data['data']['additional_messages']) # Check the output - self.assertEquals(self.expected_result[cnt], + self.assertEqual(self.expected_result[cnt], response_data['data']['result'][0][0]) cnt += 1 diff --git a/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py b/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py index 0a3af0772..8d3dbb050 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py +++ b/web/pgadmin/tools/sqleditor/tests/test_start_query_tool.py @@ -34,8 +34,8 @@ class StartQueryTool(BaseTestGenerator): data='"some sql statement"' ) - self.assertEquals(response.status, '200 OK') - self.assertEquals(response.data, b'some result') + self.assertEqual(response.status, '200 OK') + self.assertEqual(response.data, b'some result') StartRunningQuery_execute_mock \ .assert_called_with('transformed sql', 1234, ANY, False) extract_sql_from_network_parameters_mock \ diff --git a/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py b/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py index 589041acc..b12d94885 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py +++ b/web/pgadmin/tools/sqleditor/tests/test_transaction_status.py @@ -246,7 +246,7 @@ class TestTransactionControl(BaseTestGenerator): response = self.tester.post(self.auto_commit_url, data=json.dumps(auto_commit), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def _execute_select_sql(self): is_success, _ = \ @@ -254,22 +254,22 @@ class TestTransactionControl(BaseTestGenerator): query=self.select_sql, start_query_tool_url=self.start_query_tool_url, poll_url=self.poll_url) - self.assertEquals(is_success, True) + self.assertEqual(is_success, True) def _check_transaction_status(self, expected_transaction_status): # Check transaction status response = self.tester.get(self.status_url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) transaction_status = response_data['data']['status'] - self.assertEquals(transaction_status, expected_transaction_status) + self.assertEqual(transaction_status, expected_transaction_status) def _save_changed_data(self): response = self.tester.post(self.save_url, data=json.dumps(self.save_payload), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def _commit_transaction(self): is_success, _ = \ @@ -277,7 +277,7 @@ class TestTransactionControl(BaseTestGenerator): query='COMMIT;', start_query_tool_url=self.start_query_tool_url, poll_url=self.poll_url) - self.assertEquals(is_success, True) + self.assertEqual(is_success, True) def _initialize_database_connection(self): database_info = parent_node_dict["database"][-1] @@ -305,7 +305,7 @@ class TestTransactionControl(BaseTestGenerator): url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format( self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def _initialize_urls(self): self.start_query_tool_url = \ diff --git a/web/pgadmin/tools/sqleditor/tests/test_view_data.py b/web/pgadmin/tools/sqleditor/tests/test_view_data.py index c0726ad9b..4a9e14842 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_view_data.py +++ b/web/pgadmin/tools/sqleditor/tests/test_view_data.py @@ -111,20 +111,20 @@ class TestViewData(BaseTestGenerator): else: response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) url = "/sqleditor/view_data/start/{0}".format(self.trans_id) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Check the query result url = '/sqleditor/poll/{0}'.format(self.trans_id) response = self.tester.get(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) response_data = json.loads(response.data.decode('utf-8')) - self.assertEquals(response_data['data']['result'], self.result_data) - self.assertEquals(response_data['data']['rows_fetched_to'], + self.assertEqual(response_data['data']['result'], self.result_data) + self.assertEqual(response_data['data']['rows_fetched_to'], self.rows_fetched_to) def tearDown(self): diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py b/web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py index 0a7d6214a..0eed7e95f 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_apply_explain_plan_wrapper.py @@ -117,7 +117,7 @@ class StartRunningQueryTest(BaseTestGenerator): render_template_mock.return_value = self.expected_return_value result = apply_explain_plan_wrapper_if_needed( **self.function_input_parameters) - self.assertEquals(result, self.expected_return_value) + self.assertEqual(result, self.expected_return_value) if self.expect_render_template_mock_parameters: render_template_mock.assert_called_with( self.expect_render_template_mock_parameters[ diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py b/web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py index c72159313..244675b07 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_filter_dialog_callbacks.py @@ -91,13 +91,13 @@ class StartRunningDataSortingTest(BaseTestGenerator): ) if self.type == 'get': result = FilterDialog.get(*self.input_parameters) - self.assertEquals( + self.assertEqual( result.status_code, expected_response.status_code ) else: result = FilterDialog.save( *self.input_arg_parameters, **self.input_kwarg_parameters ) - self.assertEquals( + self.assertEqual( result.status_code, expected_response.status_code ) diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py b/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py index 6eda4d3cd..279c8736f 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_is_query_resultset_updatable.py @@ -156,22 +156,22 @@ class TestQueryUpdatableResultset(BaseTestGenerator): query=sql, poll_url=self.poll_url, start_query_tool_url=self.start_query_tool_url) - self.assertEquals(is_success, True) + self.assertEqual(is_success, True) return response_data def _check_primary_keys(self, response_data): primary_keys = response_data['data']['primary_keys'] - self.assertEquals(primary_keys, self.expected_primary_keys) + self.assertEqual(primary_keys, self.expected_primary_keys) def _check_oids(self, response_data): has_oids = response_data['data']['has_oids'] - self.assertEquals(has_oids, self.expected_has_oids) + self.assertEqual(has_oids, self.expected_has_oids) def _check_editable_columns(self, response_data): columns_info = response_data['data']['colinfo'] for col, expected_is_editable in \ zip(columns_info, self.expected_cols_is_editable): - self.assertEquals(col['is_editable'], expected_is_editable) + self.assertEqual(col['is_editable'], expected_is_editable) def _initialize_database_connection(self): database_info = parent_node_dict["database"][-1] @@ -204,7 +204,7 @@ class TestQueryUpdatableResultset(BaseTestGenerator): url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format( self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def _initialize_urls(self): self.start_query_tool_url = \ @@ -265,4 +265,4 @@ class TestTemporaryTable(TestQueryUpdatableResultset): results_column_data = response_data['data']['result'] for result_data, expected_is_editable in \ zip(results_column_data, self.expected_results_column_data): - self.assertEquals(result_data, expected_is_editable) + self.assertEqual(result_data, expected_is_editable) diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py b/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py index 8f7cd9dfa..4626800fe 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_save_changed_data.py @@ -874,7 +874,7 @@ class TestSaveChangedData(BaseTestGenerator): query=query, start_query_tool_url=self.start_query_tool_url, poll_url=self.poll_url) - self.assertEquals(is_success, True) + self.assertEqual(is_success, True) return response_data def _save_changed_data(self): @@ -883,19 +883,19 @@ class TestSaveChangedData(BaseTestGenerator): data=json.dumps(self.save_payload), content_type='html/json') - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Check that the save is successful response_data = json.loads(response.data.decode('utf-8')) save_status = response_data['data']['status'] - self.assertEquals(save_status, self.save_status) + self.assertEqual(save_status, self.save_status) def _check_saved_data(self): check_sql = self.check_sql % self.test_table_name response_data = self._execute_sql_query(check_sql) # Check table for updates result = response_data['data']['result'] - self.assertEquals(result, self.check_result) + self.assertEqual(result, self.check_result) def _initialize_database_connection(self): database_info = parent_node_dict["database"][-1] @@ -922,7 +922,7 @@ class TestSaveChangedData(BaseTestGenerator): url = '/datagrid/initialize/query_tool/{0}/{1}/{2}/{3}'.format( self.trans_id, utils.SERVER_GROUP, self.server_id, self.db_id) response = self.tester.post(url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def _initialize_urls_and_select_sql(self): self.start_query_tool_url = \ diff --git a/web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py b/web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py index 32715138d..6e596bb96 100644 --- a/web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py +++ b/web/pgadmin/tools/sqleditor/utils/tests/test_start_running_query.py @@ -497,12 +497,12 @@ class StartRunningQueryTest(BaseTestGenerator): '" excepted but not raised' ) - self.assertEquals(result, expected_response) + self.assertEqual(result, expected_response) except AssertionError: raise except Exception as exception: - self.assertEquals(self.manager_connection_exception, exception) + self.assertEqual(self.manager_connection_exception, exception) self.__mock_assertions(internal_server_error_mock, make_json_response_mock) diff --git a/web/pgadmin/utils/tests/test_compile_template_name.py b/web/pgadmin/utils/tests/test_compile_template_name.py index fbb40053b..5147e4e9a 100644 --- a/web/pgadmin/utils/tests/test_compile_template_name.py +++ b/web/pgadmin/utils/tests/test_compile_template_name.py @@ -36,4 +36,4 @@ class TestCompileTemplateName(BaseTestGenerator): result = compile_template_name( 'some/prefix', 'some_file.sql', self.server_type, self.version ) - self.assertEquals(result, self.expected_return_value) + self.assertEqual(result, self.expected_return_value) diff --git a/web/pgadmin/utils/tests/test_encoding.py b/web/pgadmin/utils/tests/test_encoding.py index c16c0732c..ef16dd812 100644 --- a/web/pgadmin/utils/tests/test_encoding.py +++ b/web/pgadmin/utils/tests/test_encoding.py @@ -224,4 +224,4 @@ class TestEncoding(BaseTestGenerator): def runTest(self): result = get_encoding(self.db_encoding) - self.assertEquals(result, self.expected_return_value) + self.assertEqual(result, self.expected_return_value) diff --git a/web/regression/python_test_utils/test_utils.py b/web/regression/python_test_utils/test_utils.py index 3b30b7aad..82bce5029 100644 --- a/web/regression/python_test_utils/test_utils.py +++ b/web/regression/python_test_utils/test_utils.py @@ -1208,7 +1208,7 @@ def generate_scenarios(key, test_cases): def assert_status_code(self, response): act_res = response.status_code exp_res = self.expected_data["status_code"] - return self.assertEquals(act_res, exp_res) + return self.assertEqual(act_res, exp_res) def assert_error_message(self, response, error_msg=None): @@ -1217,7 +1217,7 @@ def assert_error_message(self, response, error_msg=None): exp_res = error_msg else: exp_res = self.expected_data["error_msg"] - return self.assertEquals(act_res, exp_res) + return self.assertEqual(act_res, exp_res) def create_expected_output(parameters, actual_data): diff --git a/web/regression/re_sql/tests/test_resql.py b/web/regression/re_sql/tests/test_resql.py index 05ba712fb..88de458a6 100644 --- a/web/regression/re_sql/tests/test_resql.py +++ b/web/regression/re_sql/tests/test_resql.py @@ -268,7 +268,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): data=json.dumps(scenario['data']), content_type='html/json') try: - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) except Exception as e: self.final_test_status = False print(scenario['name'] + "... FAIL") @@ -302,7 +302,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): data=json.dumps(scenario['data']), follow_redirects=True) try: - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) except Exception as e: self.final_test_status = False print(scenario['name'] + "... FAIL") @@ -328,7 +328,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): delete_url, data=json.dumps(scenario.get('data', {})), follow_redirects=True) try: - self.assertEquals(delete_response.status_code, 200) + self.assertEqual(delete_response.status_code, 200) except Exception as e: self.final_test_status = False print(scenario['name'] + "... FAIL") @@ -395,7 +395,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): response = self.tester.get(url, follow_redirects=True) try: - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) except Exception as e: self.final_test_status = False print(scenario['name'] + "... FAIL") @@ -432,7 +432,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): sql = self.preprocess_expected_sql(scenario, sql, resp_sql, object_id) try: - self.assertEquals(sql, resp_sql) + self.assertEqual(sql, resp_sql) except Exception as e: self.final_test_status = False traceback.print_exc() @@ -458,7 +458,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): response = self.tester.get(sql_url) try: - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) except Exception as e: self.final_test_status = False @@ -487,7 +487,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): sql = self.preprocess_expected_sql(scenario, sql, resp_sql, object_id) try: - self.assertEquals(sql, resp_sql) + self.assertEqual(sql, resp_sql) except Exception as e: self.final_test_status = False traceback.print_exc() @@ -504,7 +504,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): exp_sql = self.preprocess_expected_sql(scenario, exp_sql, resp_sql, object_id) try: - self.assertEquals(exp_sql, resp_sql) + self.assertEqual(exp_sql, resp_sql) except Exception as e: self.final_test_status = False traceback.print_exc() -- 2.28.0 [application/octet-stream] 0002-Wraps-filter-usage-in-a-list-call.patch (6.8K, 4-0002-Wraps-filter-usage-in-a-list-call.patch) download | inline diff: From a47e02cd5d93ee33394001cebf023d44bcfc3d65 Mon Sep 17 00:00:00 2001 From: Cyril Jouve <[email protected]> Date: Fri, 28 Aug 2020 18:35:32 +0200 Subject: [PATCH 2/7] Wraps filter() usage in a list call. --- .../databases/schemas/sequences/__init__.py | 8 +++----- .../schemas/tables/tests/test_tables_acl_sql.py | 4 +--- web/pgadmin/tools/debugger/__init__.py | 2 +- .../tools/schema_diff/directory_compare.py | 15 ++++++--------- web/pgadmin/utils/sqlautocomplete/autocomplete.py | 4 ++-- web/regression/python_test_utils/test_utils.py | 4 +--- 6 files changed, 14 insertions(+), 23 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py index b7f34a29e..e2cf25123 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py @@ -252,11 +252,9 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare): for row in nodes: system_seq = self._get_dependency(row['oid'], show_system_objects=True) - seq = filter(lambda dep: dep['type'] == 'column' and - dep['field'] == 'internal', system_seq) - if type(seq) is not list: - seq = list(seq) - if len(seq) > 0: + seq = [dep for dep in system_seq + if dep['type'] == 'column' and dep['field'] == 'internal'] + if not seq: continue # Append the node into the newly created list diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_acl_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_acl_sql.py index fbea605cf..372a41633 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_acl_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_acl_sql.py @@ -41,9 +41,7 @@ class TestTablesAclSql(SQLTemplateTestBase): return sql def assertions(self, fetch_result, descriptions): - public_acls = list( - filter(lambda acl: acl[1] == 'PUBLIC', fetch_result) - ) + public_acls = [acl for acl in fetch_result if acl[1] == 'PUBLIC'] self.assertEqual(len(public_acls), 1) new_acl_map = dict( diff --git a/web/pgadmin/tools/debugger/__init__.py b/web/pgadmin/tools/debugger/__init__.py index b07a4de98..5130ff022 100644 --- a/web/pgadmin/tools/debugger/__init__.py +++ b/web/pgadmin/tools/debugger/__init__.py @@ -1269,7 +1269,7 @@ def messages(trans_id): # From the above message we need to find out port number # as "7" so below logic will find 7 as port number # and attach listened to that port number - tmp_list = list(filter(lambda x: 'PLDBGBREAK' in x, notify)) + tmp_list = [x for x in notify if 'PLDBGBREAK' in x] if len(tmp_list) > 0: port_number = re.search(r'\d+', tmp_list[0]) if port_number is not None: diff --git a/web/pgadmin/tools/schema_diff/directory_compare.py b/web/pgadmin/tools/schema_diff/directory_compare.py index ee143c319..59432755b 100644 --- a/web/pgadmin/tools/schema_diff/directory_compare.py +++ b/web/pgadmin/tools/schema_diff/directory_compare.py @@ -524,11 +524,10 @@ def directory_diff(source_dict, target_dict, ignore_keys=[], difference=None): ignore_keys, difference) elif type(source_dict[key]) is list: tmp_target = None - tmp_list = list(filter( - lambda x: type(x) == list or type(x) == dict, source_dict[key] - )) + tmp_list = [x for x in source_dict[key] + if isinstance(x, (list, dict))] - if len(tmp_list) > 0: + if tmp_list: tmp_target = copy.deepcopy(target_dict[key]) for index in range(len(source_dict[key])): source = copy.deepcopy(source_dict[key][index]) @@ -563,11 +562,9 @@ def directory_diff(source_dict, target_dict, ignore_keys=[], difference=None): # If no element in source dict then check for the element # is available in target and the type is of list. # Added such elements as a deleted. - tmp_tar_list = list(filter( - lambda x: type(x) == list or type(x) == dict, - target_dict[key] - )) - if len(tmp_tar_list): + tmp_tar_list = [x for x in target_dict[key] + if isinstance(x, (list, dict))] + if tmp_tar_list: difference[key] = {'deleted': target_dict[key]} if type(source) is dict and tmp_target and key in tmp_target and \ diff --git a/web/pgadmin/utils/sqlautocomplete/autocomplete.py b/web/pgadmin/utils/sqlautocomplete/autocomplete.py index 42b5d6b27..1031330aa 100644 --- a/web/pgadmin/utils/sqlautocomplete/autocomplete.py +++ b/web/pgadmin/utils/sqlautocomplete/autocomplete.py @@ -572,7 +572,7 @@ class SQLAutoComplete(object): lastword = last_word(word_before_cursor, include='most_punctuations') if lastword == '*': if suggestion.context == 'insert': - def filter(col): + def is_scoped(col): if not col.has_default: return True return not any( @@ -580,7 +580,7 @@ class SQLAutoComplete(object): for p in self.insert_col_skip_patterns ) scoped_cols = \ - dict((t, [col for col in cols if filter(col)]) + dict((t, [col for col in cols if is_scoped(col)]) for t, cols in scoped_cols.items()) if self.asterisk_column_order == 'alphabetic': for cols in scoped_cols.values(): diff --git a/web/regression/python_test_utils/test_utils.py b/web/regression/python_test_utils/test_utils.py index 82bce5029..7311f3cdc 100644 --- a/web/regression/python_test_utils/test_utils.py +++ b/web/regression/python_test_utils/test_utils.py @@ -1406,9 +1406,7 @@ def get_parallel_sequential_module_list(module_list): parallel_tests.remove(module) # list of tests can be executed in sequentially - sequential_tests = list( - filter(lambda i: i not in parallel_tests, - module_list)) + sequential_tests = [i for i in module_list if i not in parallel_tests] # return parallel & sequential lists return parallel_tests, sequential_tests -- 2.28.0 [application/octet-stream] 0003-several-transformations-that-make-Python-code-more-i.patch (32.1K, 5-0003-several-transformations-that-make-Python-code-more-i.patch) download | inline diff: From 99fb6d8a905f01c37aa0651ba7e6bfcdb4d6398a Mon Sep 17 00:00:00 2001 From: Cyril Jouve <[email protected]> Date: Fri, 28 Aug 2020 18:52:24 +0200 Subject: [PATCH 3/7] several transformations that make Python code more idiomatic --- tools/sql_keywords.py | 2 +- web/pgadmin/__init__.py | 2 +- web/pgadmin/authenticate/ldap.py | 2 +- .../browser/server_groups/servers/__init__.py | 4 +- .../databases/external_tables/__init__.py | 6 +-- .../external_tables/mapping_utils.py | 3 +- .../external_tables/tests/test_properties.py | 2 +- .../schemas/foreign_tables/__init__.py | 2 +- .../schemas/tables/schema_diff_utils.py | 6 +-- .../server_groups/servers/roles/__init__.py | 8 +-- web/pgadmin/browser/tests/test_ldap_login.py | 52 ++++++++----------- .../tools/backup/tests/test_backup_utils.py | 4 +- .../tests/test_create_maintenance_job.py | 4 +- .../restore/tests/test_create_restore_job.py | 4 +- .../tools/schema_diff/directory_compare.py | 40 +++++++------- web/pgadmin/tools/sqleditor/__init__.py | 6 +-- web/pgadmin/tools/sqleditor/command.py | 4 +- .../sqleditor/utils/start_running_query.py | 2 +- web/pgadmin/utils/ajax.py | 2 +- web/pgadmin/utils/csv.py | 2 +- web/pgadmin/utils/driver/psycopg2/__init__.py | 2 +- .../utils/driver/psycopg2/connection.py | 6 +-- web/pgadmin/utils/driver/psycopg2/cursor.py | 2 +- web/pgadmin/utils/preferences.py | 8 +-- .../python_test_utils/test_utils.py | 2 +- web/regression/re_sql/tests/test_resql.py | 2 +- 26 files changed, 85 insertions(+), 94 deletions(-) diff --git a/tools/sql_keywords.py b/tools/sql_keywords.py index 6d4c6f1e3..a862dcbbc 100644 --- a/tools/sql_keywords.py +++ b/tools/sql_keywords.py @@ -49,7 +49,7 @@ def get_release_tag(current_url=PG_CURRENT_VERSION_URL, version_regex=PG_CURRENT_VERSION_REGEX): resp_text = get_file_from_url(current_url) version = apply_regex(resp_text, version_regex) - if type(version) == list: + if isinstance(version, list): version = version[0] return "REL_" + version.replace(".", "_") diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py index e3ec4b57e..4bb58fcd1 100644 --- a/web/pgadmin/__init__.py +++ b/web/pgadmin/__init__.py @@ -164,7 +164,7 @@ class PgAdmin(Flask): def register_logout_hook(self, module): if hasattr(module, 'on_logout') and \ - type(getattr(module, 'on_logout')) == MethodType: + isinstance(getattr(module, 'on_logout'), MethodType): self.logout_hooks.append(module) diff --git a/web/pgadmin/authenticate/ldap.py b/web/pgadmin/authenticate/ldap.py index 208ac6739..2cdca8605 100644 --- a/web/pgadmin/authenticate/ldap.py +++ b/web/pgadmin/authenticate/ldap.py @@ -189,7 +189,7 @@ class LDAPAuthentication(BaseAuthentication): # Create the TLS configuration object if required tls = None - if type(uri) == str: + if isinstance(uri, str): return False, "LDAP configuration error: Set the proper LDAP URI." if uri.scheme == 'ldaps' or config.LDAP_USE_STARTTLS: diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py index 18e7a55c1..566273e57 100644 --- a/web/pgadmin/browser/server_groups/servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/__init__.py @@ -38,10 +38,10 @@ def has_any(data, keys): """ Checks any one of the keys present in the data given """ - if data is None and type(data) != dict: + if data is None and not isinstance(data, dict): return False - if keys is None and type(keys) != list: + if keys is None and not isinstance(keys, list): return False for key in keys: diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py index 8c256bb26..cf902321e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/__init__.py @@ -167,7 +167,7 @@ class ExternalTablesView(PGChildNodeView): result = self.get_external_tables(database_id, sql_statement) - if type(result) is not list: + if not isinstance(result, list): return result return make_json_response( @@ -197,10 +197,10 @@ class ExternalTablesView(PGChildNodeView): ) result = self.get_external_tables(database_id, sql_statement) - if type(result) is not list: + if not isinstance(result, list): return result - if len(result) == 0: + if not result: return make_json_response( data=gettext('Could not find the external table.'), status=404 diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/mapping_utils.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/mapping_utils.py index 53a472331..585eacc11 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/mapping_utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/mapping_utils.py @@ -99,8 +99,7 @@ def format_options(format_type, options): return options result_options = tokenize_options(options) - all_keys = list(result_options.keys()) - all_keys.sort() + all_keys = sorted(result_options) if format_type not in ['csv', 'text']: return ','.join([ '%s = %s' % (key, result_options[key]) for key in all_keys diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py index 9d292e3bb..742fb2167 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/tests/test_properties.py @@ -130,7 +130,7 @@ class TestProperties(BaseTestGenerator): self.fail('No exception was raised') except PropertiesException as exception: if hasattr(self, 'expected_raise_exception'): - if type(exception) is self.expected_raise_exception: + if isinstance(exception, self.expected_raise_exception): if hasattr(self, 'expected_internal_server_error_called_with'): internal_server_error_mock.assert_called_with( diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py index 766434e02..4686b5caf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py @@ -275,7 +275,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader, ): # Coverts string into python list as expected. data[key] = [] - if type(req[key]) != list or len(req[key]) != 0: + if not isinstance(req[key], list) and req[key]: data[key] = json.loads(req[key], encoding='utf-8') if key == 'inherits': diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/schema_diff_utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/schema_diff_utils.py index 2846a902b..c96f02937 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/schema_diff_utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/schema_diff_utils.py @@ -124,8 +124,7 @@ class SchemaDiffTableCompare(SchemaDiffObjectCompare): for source in source_cols: if 'name' in source: - if type(target_cols) is list and len( - target_cols) > 0: + if isinstance(target_cols, list) and target_cols: tmp = None for item in target_cols: if item['name'] == source['name']: @@ -190,8 +189,7 @@ class SchemaDiffTableCompare(SchemaDiffObjectCompare): different[constraint] = {} for source in source_cols: if 'name' in source: - if type(target_cols) is list and len( - target_cols) > 0: + if isinstance(target_cols, list) and target_cols: tmp_src = copy.deepcopy(source) if 'oid' in tmp_src: tmp_src.pop('oid') diff --git a/web/pgadmin/browser/server_groups/servers/roles/__init__.py b/web/pgadmin/browser/server_groups/servers/roles/__init__.py index c976ded38..e2f7aa935 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/roles/__init__.py @@ -119,11 +119,11 @@ class RoleView(PGChildNodeView): :param req_keys: required keys :return: Valid or Invalid """ - if type(data) != list: + if not isinstance(data, list): return False for item in data: - if type(item) != dict: + if not isinstance(item, dict): return False for a_key in req_keys: @@ -142,7 +142,7 @@ class RoleView(PGChildNodeView): :param req_delete_keys: required keys when deleting :return: Valid or Invalid """ - if type(data) != dict: + if not isinstance(data, dict): return False for op in [u'added', u'deleted', u'changed']: @@ -188,7 +188,7 @@ class RoleView(PGChildNodeView): if data[u'rolconnlimit'] is not None: data[u'rolconnlimit'] = int(data[u'rolconnlimit']) - if type(data[u'rolconnlimit']) != int or \ + if not isinstance(data[u'rolconnlimit'], int) or \ data[u'rolconnlimit'] < -1: return _("Connection limit must be an integer value " "or equal to -1.") diff --git a/web/pgadmin/browser/tests/test_ldap_login.py b/web/pgadmin/browser/tests/test_ldap_login.py index e73e62e83..139d718ce 100644 --- a/web/pgadmin/browser/tests/test_ldap_login.py +++ b/web/pgadmin/browser/tests/test_ldap_login.py @@ -46,37 +46,31 @@ class LDAPLoginTestCase(BaseTestGenerator): cls.tester.logout() def setUp(self): - if 'ldap_config' in config_data and \ - type(config_data['ldap_config']) is list and\ - len(config_data['ldap_config']) > 0 and\ - self.config_key_param in config_data['ldap_config'][0]: + try: ldap_config = config_data['ldap_config'][0][self.config_key_param] + except (KeyError, TypeError, IndexError): + self.skipTest("LDAP config not set.") + app_config.AUTHENTICATION_SOURCES = ['ldap'] + app_config.LDAP_AUTO_CREATE_USER = True + app_config.LDAP_SERVER_URI = ldap_config['uri'] + app_config.LDAP_BASE_DN = ldap_config['base_dn'] + app_config.LDAP_USERNAME_ATTRIBUTE = ldap_config[ + 'username_atr'] + app_config.LDAP_SEARCH_BASE_DN = ldap_config[ + 'search_base_dn'] + app_config.LDAP_SEARCH_FILTER = ldap_config['search_filter'] + app_config.LDAP_USE_STARTTLS = ldap_config['use_starttls'] + app_config.LDAP_CA_CERT_FILE = ldap_config['ca_cert_file'] + app_config.LDAP_CERT_FILE = ldap_config['cert_file'] + app_config.LDAP_KEY_FILE = ldap_config['key_file'] + if ldap_config['bind_user'] != "" and\ + ldap_config['bind_password'] != "": + app_config.LDAP_BIND_USER = ldap_config['bind_user'] + app_config.LDAP_BIND_PASSWORD = ldap_config['bind_password'] + if ldap_config['anonymous_bind'] != "" and\ + ldap_config['anonymous_bind']: + app_config.LDAP_ANONYMOUS_BIND = True - app_config.AUTHENTICATION_SOURCES = ['ldap'] - app_config.LDAP_AUTO_CREATE_USER = True - app_config.LDAP_SERVER_URI = ldap_config['uri'] - app_config.LDAP_BASE_DN = ldap_config['base_dn'] - app_config.LDAP_USERNAME_ATTRIBUTE = ldap_config[ - 'username_atr'] - app_config.LDAP_SEARCH_BASE_DN = ldap_config[ - 'search_base_dn'] - app_config.LDAP_SEARCH_FILTER = ldap_config['search_filter'] - app_config.LDAP_USE_STARTTLS = ldap_config['use_starttls'] - app_config.LDAP_CA_CERT_FILE = ldap_config['ca_cert_file'] - app_config.LDAP_CERT_FILE = ldap_config['cert_file'] - app_config.LDAP_KEY_FILE = ldap_config['key_file'] - if ldap_config['bind_user'] != "" and\ - ldap_config['bind_password'] != "": - app_config.LDAP_BIND_USER = ldap_config['bind_user'] - app_config.LDAP_BIND_PASSWORD = ldap_config['bind_password'] - if ldap_config['anonymous_bind'] != "" and\ - ldap_config['anonymous_bind']: - app_config.LDAP_ANONYMOUS_BIND = True - - else: - self.skipTest( - "LDAP config not set." - ) def runTest(self): """This function checks login functionality.""" diff --git a/web/pgadmin/tools/backup/tests/test_backup_utils.py b/web/pgadmin/tools/backup/tests/test_backup_utils.py index eeddf4a1a..497a60e52 100644 --- a/web/pgadmin/tools/backup/tests/test_backup_utils.py +++ b/web/pgadmin/tools/backup/tests/test_backup_utils.py @@ -27,7 +27,7 @@ def run_backup_job(tester, job_id, expected_params, assert_in, assert_not_in, assert_equal): cnt = 0 the_process = None - while 1: + while True: if cnt >= 5: break # Check the process list @@ -81,7 +81,7 @@ def run_backup_job(tester, job_id, expected_params, assert_in, assert_not_in, cnt = 0 # Retrieve the backup job process logs - while 1: + while True: out, err, status = get_params(p_details_data) if status or cnt >= 5: break diff --git a/web/pgadmin/tools/maintenance/tests/test_create_maintenance_job.py b/web/pgadmin/tools/maintenance/tests/test_create_maintenance_job.py index e479ede34..c36fbd181 100644 --- a/web/pgadmin/tools/maintenance/tests/test_create_maintenance_job.py +++ b/web/pgadmin/tools/maintenance/tests/test_create_maintenance_job.py @@ -75,7 +75,7 @@ class MaintenanceJobTest(BaseTestGenerator): cnt = 0 the_process = None - while 1: + while True: if cnt >= 10: break # Check the process list @@ -118,7 +118,7 @@ class MaintenanceJobTest(BaseTestGenerator): p_details_data = json.loads(p_details.data.decode('utf-8')) # Retrieve the backup job process logs - while 1: + while True: out, err, status = MaintenanceJobTest.get_params(p_details_data) if status: break diff --git a/web/pgadmin/tools/restore/tests/test_create_restore_job.py b/web/pgadmin/tools/restore/tests/test_create_restore_job.py index 21c485cae..305ebcdd0 100644 --- a/web/pgadmin/tools/restore/tests/test_create_restore_job.py +++ b/web/pgadmin/tools/restore/tests/test_create_restore_job.py @@ -115,7 +115,7 @@ class RestoreJobTest(BaseTestGenerator): cnt = 0 the_process = None - while 1: + while True: if cnt >= 5: break # Check the process list @@ -165,7 +165,7 @@ class RestoreJobTest(BaseTestGenerator): # Retrieve the restore job process logs cnt = 0 - while 1: + while True: out, err, status = RestoreJobTest.get_params(p_details_data) if status or cnt >= 5: break diff --git a/web/pgadmin/tools/schema_diff/directory_compare.py b/web/pgadmin/tools/schema_diff/directory_compare.py index 59432755b..e082fd92b 100644 --- a/web/pgadmin/tools/schema_diff/directory_compare.py +++ b/web/pgadmin/tools/schema_diff/directory_compare.py @@ -396,7 +396,7 @@ def are_lists_identical(source_list, target_list, ignore_whitespaces, for index in range(len(source_list)): # Check the type of the value if it is an dictionary then # call are_dictionaries_identical() function. - if type(source_list[index]) is dict: + if isinstance(source_list[index], dict): if not are_dictionaries_identical(source_list[index], target_list[index], ignore_whitespaces, @@ -444,13 +444,13 @@ def are_dictionaries_identical(source_dict, target_dict, ignore_whitespaces, if key in ignore_keys: continue - if type(source_dict[key]) is dict: + if isinstance(source_dict[key], dict): if not are_dictionaries_identical(source_dict[key], target_dict[key], ignore_whitespaces, ignore_keys): return False - elif type(source_dict[key]) is list: + elif isinstance(source_dict[key], list): # Sort the source and target list on the basis of # list key array. source_dict[key], target_dict[key] = sort_list(source_dict[key], @@ -511,18 +511,18 @@ def directory_diff(source_dict, target_dict, ignore_keys=[], difference=None): if key in ignore_keys: continue elif key in tar_only: - if type(target_dict[key]) is list: + if isinstance(target_dict[key], list): difference[key] = {} difference[key]['deleted'] = target_dict[key] elif key in src_only: # Source only values in the newly added list - if type(source_dict[key]) is list: + if isinstance(source_dict[key], list): difference[key] = {} difference[key]['added'] = source_dict[key] - elif type(source_dict[key]) is dict: + elif isinstance(source_dict[key], dict): directory_diff(source_dict[key], target_dict[key], ignore_keys, difference) - elif type(source_dict[key]) is list: + elif isinstance(source_dict[key], list): tmp_target = None tmp_list = [x for x in source_dict[key] if isinstance(x, (list, dict))] @@ -531,10 +531,10 @@ def directory_diff(source_dict, target_dict, ignore_keys=[], difference=None): tmp_target = copy.deepcopy(target_dict[key]) for index in range(len(source_dict[key])): source = copy.deepcopy(source_dict[key][index]) - if type(source) is list: + if isinstance(source, list): # TODO pass - elif type(source) is dict: + elif isinstance(source, dict): # Check the above keys are exist in the dictionary tmp_key = is_key_exists(list_keys_array, source) if tmp_key is not None: @@ -549,16 +549,16 @@ def directory_diff(source_dict, target_dict, ignore_keys=[], difference=None): if len(updated) > 0: difference[key]['changed'] = updated elif target_dict[key] is None or \ - (type(target_dict[key]) is list and + (isinstance(target_dict[key], list) and len(target_dict[key]) < index and source != target_dict[key][index]): difference[key] = source - elif type(target_dict[key]) is list and\ + elif isinstance(target_dict[key], list) and\ len(target_dict[key]) > index: difference[key] = source elif len(source_dict[key]) > 0: difference[key] = source_dict[key] - elif key in target_dict and type(target_dict[key]) is list: + elif key in target_dict and isinstance(target_dict[key], list): # If no element in source dict then check for the element # is available in target and the type is of list. # Added such elements as a deleted. @@ -567,15 +567,15 @@ def directory_diff(source_dict, target_dict, ignore_keys=[], difference=None): if tmp_tar_list: difference[key] = {'deleted': target_dict[key]} - if type(source) is dict and tmp_target and key in tmp_target and \ + if isinstance(source, dict) and tmp_target and key in tmp_target and \ tmp_target[key] and len(tmp_target[key]) > 0: - if type(tmp_target[key]) is list and \ - type(tmp_target[key][0]) is dict: + if isinstance(tmp_target[key], list) and \ + isinstance(tmp_target[key][0], dict): deleted = deleted + tmp_target[key] else: deleted.append({key: tmp_target[key]}) difference[key]['deleted'] = deleted - elif tmp_target and type(tmp_target) is list: + elif tmp_target and isinstance(tmp_target, list): difference[key]['deleted'] = tmp_target # No point adding empty list into difference. @@ -620,7 +620,7 @@ def _check_key_in_source_target(key, acl_keys, target, source): key = is_key_exists(acl_keys, target) if key is None: key = 'acl' - elif key is not None and type(source[key]) != list: + elif key is not None and not isinstance(source[key], list): key = 'acl' return key @@ -671,13 +671,13 @@ def sort_list(source, target): :return: """ # Check the above keys are exist in the dictionary - if source is not None and len(source) > 0 and type(source[0]) == dict: + if source is not None and source and isinstance(source[0], dict): tmp_key = is_key_exists(list_keys_array, source[0]) if tmp_key is not None: source = sorted(source, key=lambda k: k[tmp_key]) # Check the above keys are exist in the dictionary - if target is not None and len(target) > 0 and type(target[0]) == dict: + if target is not None and target and isinstance(target[0], dict): tmp_key = is_key_exists(list_keys_array, target[0]) if tmp_key is not None: target = sorted(target, key=lambda k: k[tmp_key]) @@ -698,7 +698,7 @@ def compare_list_by_ignoring_keys(source_list, target_list, added, updated, :param ignore_keys: :return: """ - if type(target_list) is list and len(target_list) > 0: + if isinstance(target_list, list) and target_list: tmp_target = None for item in target_list: if key in item and item[key] == source_list[key]: diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py index 9f08e472f..b96b98846 100644 --- a/web/pgadmin/tools/sqleditor/__init__.py +++ b/web/pgadmin/tools/sqleditor/__init__.py @@ -309,7 +309,7 @@ def extract_sql_from_network_parameters(request_data, request_arguments, if request_data: sql_parameters = json.loads(request_data, encoding='utf-8') - if type(sql_parameters) is str: + if isinstance(sql_parameters, str): return dict(sql=str(sql_parameters), explain_plan=None) return sql_parameters else: @@ -616,7 +616,7 @@ def generate_client_primary_key_name(columns_info): initial_temp_key_len = len(temp_key) duplicate = False suffix = 1 - while 1: + while True: for col in columns_info: if col['name'] == temp_key: duplicate = True @@ -1414,7 +1414,7 @@ def query_tool_status(trans_id): (status, error_msg, conn, trans_obj, session_obj) = check_transaction_status(trans_id) - if not status and error_msg and type(error_msg) == str: + if not status and error_msg and isinstance(error_msg, str): return internal_server_error( errormsg=error_msg ) diff --git a/web/pgadmin/tools/sqleditor/command.py b/web/pgadmin/tools/sqleditor/command.py index 0664be510..cedbe6aa4 100644 --- a/web/pgadmin/tools/sqleditor/command.py +++ b/web/pgadmin/tools/sqleditor/command.py @@ -169,7 +169,7 @@ class SQLFilter(object): self.did = kwargs['did'] self.obj_id = kwargs['obj_id'] sql_filter = kwargs.get('sql_filter', None) - self._row_filter = sql_filter if type(sql_filter) is str else None + self._row_filter = sql_filter if isinstance(sql_filter, str) else None self._data_sorting = kwargs.get('data_sorting', None) self._set_sorting_from_filter_dialog = False @@ -212,7 +212,7 @@ class SQLFilter(object): Args: row_filter: sql query """ - if type(row_filter) is not str: + if not isinstance(row_filter, str): row_filter = None status, msg = self.validate_filter(row_filter) diff --git a/web/pgadmin/tools/sqleditor/utils/start_running_query.py b/web/pgadmin/tools/sqleditor/utils/start_running_query.py index cddd64ecd..ab845cc51 100644 --- a/web/pgadmin/tools/sqleditor/utils/start_running_query.py +++ b/web/pgadmin/tools/sqleditor/utils/start_running_query.py @@ -42,7 +42,7 @@ class StartRunningQuery: http_session, trans_id ) - if type(session_obj) is Response: + if isinstance(session_obj, Response): return session_obj # Remove any existing primary keys or has_oids in session_obj diff --git a/web/pgadmin/utils/ajax.py b/web/pgadmin/utils/ajax.py index 7c37d20ed..efebd6257 100644 --- a/web/pgadmin/utils/ajax.py +++ b/web/pgadmin/utils/ajax.py @@ -35,7 +35,7 @@ class ColParamsJSONDecoder(json.JSONDecoder): retval = obj try: retval = json.JSONDecoder.decode(self, obj) - if type(retval) == str: + if isinstance(retval, str): retval = obj except (ValueError, TypeError, KeyError): retval = obj diff --git a/web/pgadmin/utils/csv.py b/web/pgadmin/utils/csv.py index fd67df230..11bb56950 100644 --- a/web/pgadmin/utils/csv.py +++ b/web/pgadmin/utils/csv.py @@ -555,7 +555,7 @@ class Dialect(object): def validate_text(dialect, attr): val = getattr(dialect, attr) if not isinstance(val, str): - if type(val) == bytes: + if isinstance(val, bytes): raise Error('"{0}" must be string, not bytes'.format(attr)) raise Error('"{0}" must be string, not {1}'.format( attr, type(val).__name__)) diff --git a/web/pgadmin/utils/driver/psycopg2/__init__.py b/web/pgadmin/utils/driver/psycopg2/__init__.py index 016e585d7..f957c96c8 100644 --- a/web/pgadmin/utils/driver/psycopg2/__init__.py +++ b/web/pgadmin/utils/driver/psycopg2/__init__.py @@ -385,7 +385,7 @@ class Driver(BaseDriver): value = None for val in args: - if type(val) == list: + if isinstance(val, list): return map(lambda w: Driver.qtIdent(conn, w), val) # DataType doesn't have len function then convert it to string diff --git a/web/pgadmin/utils/driver/psycopg2/connection.py b/web/pgadmin/utils/driver/psycopg2/connection.py index 75f46198e..49c87084d 100644 --- a/web/pgadmin/utils/driver/psycopg2/connection.py +++ b/web/pgadmin/utils/driver/psycopg2/connection.py @@ -608,7 +608,7 @@ WHERE if self.conn and \ self.conn.encoding in ('SQL_ASCII', 'SQLASCII', 'MULE_INTERNAL', 'MULEINTERNAL')\ - and params is not None and type(params) == dict: + and params is not None and isinstance(params, dict): for key, val in params.items(): modified_val = val # "unicode_escape" will convert single backslash to double @@ -1283,7 +1283,7 @@ Failed to reset the connection to the server due to following error: conn: connection object """ - while 1: + while True: state = conn.poll() if state == psycopg2.extensions.POLL_OK: break @@ -1309,7 +1309,7 @@ Failed to reset the connection to the server due to following error: time: wait time """ - while 1: + while True: state = conn.poll() if state == psycopg2.extensions.POLL_OK: diff --git a/web/pgadmin/utils/driver/psycopg2/cursor.py b/web/pgadmin/utils/driver/psycopg2/cursor.py index e5f663a48..82ec3d592 100644 --- a/web/pgadmin/utils/driver/psycopg2/cursor.py +++ b/web/pgadmin/utils/driver/psycopg2/cursor.py @@ -232,7 +232,7 @@ class DictCursor(_cursor): it = _cursor.__iter__(self) try: yield self._dict_tuple(next(it)) - while 1: + while True: yield self._dict_tuple(next(it)) except StopIteration: pass diff --git a/web/pgadmin/utils/preferences.py b/web/pgadmin/utils/preferences.py index 8b2ad4c90..5495f019c 100644 --- a/web/pgadmin/utils/preferences.py +++ b/web/pgadmin/utils/preferences.py @@ -163,7 +163,7 @@ class _Preference(object): try: if self._type in ('boolean', 'switch', 'node'): - assert type(value) == bool + assert isinstance(value, bool) elif self._type == 'options': has_value = next((True for opt in self.options if 'value' in opt and opt['value'] == value), @@ -175,11 +175,11 @@ class _Preference(object): value = parser_map.get(self._type, lambda v: v)(value) if self._type == 'integer': value = self.normalize_range(value) - assert type(value) == int + assert isinstance(value, int) if self._type == 'numeric': value = self.normalize_range(value) - assert (type(value) == int or type(value) == float or - type(value) == decimal.Decimal) + assert (isinstance(value, int) or isinstance(value, float) or + isinstance(value, decimal.Decimal)) except Exception as e: current_app.logger.exception(e) return False, gettext( diff --git a/web/regression/python_test_utils/test_utils.py b/web/regression/python_test_utils/test_utils.py index 7311f3cdc..6d66af15a 100644 --- a/web/regression/python_test_utils/test_utils.py +++ b/web/regression/python_test_utils/test_utils.py @@ -1100,7 +1100,7 @@ def get_server_type(server): pg_cursor.execute("SELECT version()") version_string = pg_cursor.fetchone() connection.close() - if type(version_string) == tuple: + if isinstance(version_string, tuple): version_string = version_string[0] if "Greenplum Database" in version_string: diff --git a/web/regression/re_sql/tests/test_resql.py b/web/regression/re_sql/tests/test_resql.py index 88de458a6..09d4a0801 100644 --- a/web/regression/re_sql/tests/test_resql.py +++ b/web/regression/re_sql/tests/test_resql.py @@ -402,7 +402,7 @@ class ReverseEngineeredSQLTestCases(BaseTestGenerator): traceback.print_exc() return False try: - if type(response.data) == bytes: + if isinstance(response.data, bytes): response_data = response.data.decode('utf8') resp = json.loads(response_data) else: -- 2.28.0 [application/octet-stream] 0004-Converts-the-old-metaclass-syntax-to-the-new.patch (822B, 6-0004-Converts-the-old-metaclass-syntax-to-the-new.patch) download | inline diff: From 5ae6c07c58ede6c19b55e67aa7a32b1d4657378c Mon Sep 17 00:00:00 2001 From: Cyril Jouve <[email protected]> Date: Fri, 28 Aug 2020 18:57:33 +0200 Subject: [PATCH 4/7] Converts the old metaclass syntax to the new --- web/pgadmin/misc/bgprocess/processes.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py index 0138394d1..a635d2a68 100644 --- a/web/pgadmin/misc/bgprocess/processes.py +++ b/web/pgadmin/misc/bgprocess/processes.py @@ -49,9 +49,7 @@ def get_current_time(format='%Y-%m-%d %H:%M:%S.%f %z'): ).strftime(format) -class IProcessDesc(object): - __metaclass__ = ABCMeta - +class IProcessDesc(object, metaclass=ABCMeta): @abstractproperty def message(self): pass -- 2.28.0 [application/octet-stream] 0005-Renames-xrange-to-range.patch (1.2K, 7-0005-Renames-xrange-to-range.patch) download | inline diff: From 28bee047a97a434b8b318c5d0d2ae5a69f853499 Mon Sep 17 00:00:00 2001 From: Cyril Jouve <[email protected]> Date: Fri, 28 Aug 2020 19:02:14 +0200 Subject: [PATCH 5/7] Renames xrange() to range() --- web/pgadmin/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py index 4bb58fcd1..08ae0ca48 100644 --- a/web/pgadmin/__init__.py +++ b/web/pgadmin/__init__.py @@ -40,10 +40,7 @@ from pgadmin.utils.ajax import internal_server_error from pgadmin.utils.csrf import pgCSRFProtect from pgadmin import authenticate -# If script is running under python3, it will not have the xrange function -# defined winreg = None -xrange = range if os.name == 'nt': import winreg @@ -506,7 +503,7 @@ def create_app(app_name=None): "SOFTWARE\\" + server_type + "\\Services", 0, winreg.KEY_READ | arch_key ) - for i in xrange(0, winreg.QueryInfoKey(root_key)[0]): + for i in range(0, winreg.QueryInfoKey(root_key)[0]): inst_id = winreg.EnumKey(root_key, i) inst_key = winreg.OpenKey(root_key, inst_id) -- 2.28.0 [application/octet-stream] 0006-Renames-unicode-to-str.patch (106.3K, 8-0006-Renames-unicode-to-str.patch) download | inline diff: From bfc3903375d3277ef56ea9fbb286d50839b3aa73 Mon Sep 17 00:00:00 2001 From: Cyril Jouve <[email protected]> Date: Fri, 28 Aug 2020 19:03:47 +0200 Subject: [PATCH 6/7] Renames unicode to str --- docs/en_US/conf.py | 8 +- web/config.py | 4 +- web/pgAdmin4.py | 2 +- web/pgadmin/__init__.py | 8 +- web/pgadmin/about/__init__.py | 2 +- web/pgadmin/browser/__init__.py | 8 +- web/pgadmin/browser/server_groups/__init__.py | 12 +- .../browser/server_groups/servers/__init__.py | 20 +-- .../servers/databases/__init__.py | 6 +- .../servers/databases/casts/__init__.py | 2 +- .../databases/event_triggers/__init__.py | 2 +- .../foreign_data_wrappers/__init__.py | 2 +- .../foreign_servers/__init__.py | 2 +- .../foreign_servers/user_mappings/__init__.py | 2 +- .../servers/databases/schemas/__init__.py | 4 +- .../databases/schemas/collations/__init__.py | 2 +- .../databases/schemas/domains/__init__.py | 2 +- .../domains/domain_constraints/__init__.py | 2 +- .../schemas/foreign_tables/__init__.py | 10 +- .../schemas/fts_configurations/__init__.py | 2 +- .../schemas/fts_dictionaries/__init__.py | 4 +- .../schemas/fts_templates/__init__.py | 2 +- .../databases/schemas/functions/__init__.py | 6 +- .../databases/schemas/packages/__init__.py | 8 +- .../schemas/packages/edbfuncs/__init__.py | 2 +- .../schemas/packages/edbvars/__init__.py | 6 +- .../databases/schemas/sequences/__init__.py | 10 +- .../databases/schemas/tables/__init__.py | 8 +- .../schemas/tables/columns/__init__.py | 2 +- .../schemas/tables/compound_triggers/utils.py | 2 +- .../constraints/check_constraint/__init__.py | 2 +- .../exclusion_constraint/__init__.py | 2 +- .../constraints/foreign_key/__init__.py | 2 +- .../constraints/index_constraint/__init__.py | 4 +- .../constraints/index_constraint/utils.py | 2 +- .../databases/schemas/tables/indexes/utils.py | 2 +- .../tables/row_security_policies/utils.py | 2 +- .../tests/test_tables_properties_sql.py | 2 +- .../schemas/tables/triggers/utils.py | 2 +- .../servers/databases/schemas/tables/utils.py | 12 +- .../databases/schemas/types/__init__.py | 2 +- .../databases/schemas/views/__init__.py | 4 +- .../server_groups/servers/pgagent/__init__.py | 2 +- .../server_groups/servers/roles/__init__.py | 126 +++++++++--------- .../servers/tablespaces/__init__.py | 2 +- web/pgadmin/misc/bgprocess/processes.py | 26 ++-- web/pgadmin/misc/file_manager/__init__.py | 126 +++++++++--------- web/pgadmin/setup/db_upgrade.py | 2 +- web/pgadmin/setup/user_info.py | 16 +-- web/pgadmin/tools/backup/__init__.py | 2 +- web/pgadmin/tools/import_export/__init__.py | 2 +- web/pgadmin/tools/restore/__init__.py | 2 +- web/pgadmin/tools/sqleditor/__init__.py | 8 +- web/pgadmin/utils/__init__.py | 8 +- web/pgadmin/utils/driver/psycopg2/__init__.py | 28 ++-- .../utils/driver/psycopg2/connection.py | 104 +++++++-------- .../driver/psycopg2/generate_keywords.py | 6 +- .../utils/driver/psycopg2/server_manager.py | 12 +- .../tests/test_javascript_bundler.py | 4 +- web/pgadmin/utils/preferences.py | 2 +- .../utils/sqlautocomplete/autocomplete.py | 2 +- .../utils/sqlautocomplete/parseutils/ctes.py | 2 +- web/setup.py | 4 +- 63 files changed, 338 insertions(+), 338 deletions(-) diff --git a/docs/en_US/conf.py b/docs/en_US/conf.py index 865c04f49..256c62a73 100644 --- a/docs/en_US/conf.py +++ b/docs/en_US/conf.py @@ -208,8 +208,8 @@ htmlhelp_basename = 'pgadmin4' # (source start file, target name, title, author, documentclass # [howto/manual]). latex_documents = [ - ('index', 'pgadmin4.tex', u'pgAdmin 4 Documentation', - u'The pgAdmin Development Team', 'manual'), + ('index', 'pgadmin4.tex', 'pgAdmin 4 Documentation', + 'The pgAdmin Development Team', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -247,6 +247,6 @@ latex_elements = { # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'pgadmin4', u'pgAdmin 4 Documentation', - [u'The pgAdmin Development Team'], 1) + ('index', 'pgadmin4', 'pgAdmin 4 Documentation', + ['The pgAdmin Development Team'], 1) ] diff --git a/web/config.py b/web/config.py index 893168cc8..92986249f 100644 --- a/web/config.py +++ b/web/config.py @@ -204,13 +204,13 @@ APP_VERSION_EXTN = ('.css', '.js', '.html', '.svg', '.png', '.gif', '.ico') if IS_WIN: # Use the short path on windows DATA_DIR = os.path.realpath( - os.path.join(fs_short_path(env('APPDATA')), u"pgAdmin") + os.path.join(fs_short_path(env('APPDATA')), "pgAdmin") ) else: if SERVER_MODE: DATA_DIR = '/var/lib/pgadmin' else: - DATA_DIR = os.path.realpath(os.path.expanduser(u'~/.pgadmin/')) + DATA_DIR = os.path.realpath(os.path.expanduser('~/.pgadmin/')) # An optional login banner to show security warnings/disclaimers etc. at # login and password recovery etc. HTML may be included for basic formatting, diff --git a/web/pgAdmin4.py b/web/pgAdmin4.py index 04c4ffeaa..8e0eb99d3 100644 --- a/web/pgAdmin4.py +++ b/web/pgAdmin4.py @@ -81,7 +81,7 @@ config.SETTINGS_SCHEMA_VERSION = SCHEMA_VERSION if not os.path.isfile(config.SQLITE_PATH): setup_py = os.path.join( os.path.dirname(os.path.realpath(u_encode(__file__, fs_encoding))), - u'setup.py' + 'setup.py' ) exec(open(file_quote(setup_py), 'r').read()) diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py index 08ae0ca48..516ba2c4d 100644 --- a/web/pgadmin/__init__.py +++ b/web/pgadmin/__init__.py @@ -309,8 +309,8 @@ def create_app(app_name=None): # Setup authentication ########################################################################## - app.config['SQLALCHEMY_DATABASE_URI'] = u'sqlite:///{0}?timeout={1}' \ - .format(config.SQLITE_PATH.replace(u'\\', u'/'), + app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///{0}?timeout={1}' \ + .format(config.SQLITE_PATH.replace('\\', '/'), getattr(config, 'SQLITE_TIMEOUT', 500) ) @@ -565,8 +565,8 @@ def create_app(app_name=None): svr_discovery_id = section description = registry.get(section, 'Description') data_directory = registry.get(section, 'DataDirectory') - svr_comment = gettext(u"Auto-detected {0} installation " - u"with the data directory at {1}" + svr_comment = gettext("Auto-detected {0} installation " + "with the data directory at {1}" ).format(description, data_directory) add_server(user_id, servergroup_id, svr_name, svr_superuser, svr_port, svr_discovery_id, diff --git a/web/pgadmin/about/__init__.py b/web/pgadmin/about/__init__.py index e56a191ff..083246f2a 100644 --- a/web/pgadmin/about/__init__.py +++ b/web/pgadmin/about/__init__.py @@ -33,7 +33,7 @@ class AboutModule(PgAdminModule): module="pgAdmin.About", callback='about_show', icon='fa fa-info-circle', - label=gettext(u'About %(appname)s', appname=appname) + label=gettext('About %(appname)s', appname=appname) ) ] } diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py index 90665374a..5375e944f 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -62,12 +62,12 @@ BROWSER_STATIC = 'browser.static' JQUERY_ACIPLUGIN = 'jquery.aciplugin' BROWSER_INDEX = 'browser.index' PGADMIN_BROWSER = 'pgAdmin.Browser' -PASS_ERROR_MSG = u'Your password has not been changed.' -SMTP_SOCKET_ERROR = u'SMTP Socket error: {error}\n {pass_error}'.format( +PASS_ERROR_MSG = 'Your password has not been changed.' +SMTP_SOCKET_ERROR = 'SMTP Socket error: {error}\n {pass_error}'.format( error={}, pass_error=PASS_ERROR_MSG) -SMTP_ERROR = u'SMTP error: {error}\n {pass_error}'.format( +SMTP_ERROR = 'SMTP error: {error}\n {pass_error}'.format( error={}, pass_error=PASS_ERROR_MSG) -PASS_ERROR = u'Error: {error}\n {pass_error}'.format( +PASS_ERROR = 'Error: {error}\n {pass_error}'.format( error={}, pass_error=PASS_ERROR_MSG) diff --git a/web/pgadmin/browser/server_groups/__init__.py b/web/pgadmin/browser/server_groups/__init__.py index 3c4ec6831..717795bde 100644 --- a/web/pgadmin/browser/server_groups/__init__.py +++ b/web/pgadmin/browser/server_groups/__init__.py @@ -177,8 +177,8 @@ class ServerGroupView(NodeView): ) else: try: - if u'name' in data: - servergroup.name = data[u'name'] + if 'name' in data: + servergroup.name = data['name'] db.session.commit() except exc.IntegrityError: db.session.rollback() @@ -230,16 +230,16 @@ class ServerGroupView(NodeView): data = request.form if request.form else json.loads( request.data, encoding='utf-8' ) - if data[u'name'] != '': + if data['name'] != '': try: sg = ServerGroup( user_id=current_user.id, - name=data[u'name']) + name=data['name']) db.session.add(sg) db.session.commit() - data[u'id'] = sg.id - data[u'name'] = sg.name + data['id'] = sg.id + data['name'] = sg.name return jsonify( node=self.blueprint.generate_browser_node( diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py index 566273e57..2eb058a40 100644 --- a/web/pgadmin/browser/server_groups/servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/__init__.py @@ -726,9 +726,9 @@ class ServerNode(PGChildNodeView): def create(self, gid): """Add a server node to the settings database""" required_args = [ - u'name', - u'db', - u'sslmode', + 'name', + 'db', + 'sslmode', ] data = request.form if request.form else json.loads( @@ -743,10 +743,10 @@ class ServerNode(PGChildNodeView): # Some fields can be provided with service file so they are optional if 'service' in data and not data['service']: required_args.extend([ - u'host', - u'port', - u'username', - u'role' + 'host', + 'port', + 'username', + 'role' ]) for arg in required_args: if arg not in data: @@ -786,8 +786,8 @@ class ServerNode(PGChildNodeView): ssl_mode=data.get('sslmode'), comment=data.get('comment', None), role=data.get('role', None), - db_res=','.join(data[u'db_res']) - if u'db_res' in data else None, + db_res=','.join(data['db_res']) + if 'db_res' in data else None, sslcert=data.get('sslcert', None), sslkey=data.get('sslkey', None), sslrootcert=data.get('sslrootcert', None), @@ -851,7 +851,7 @@ class ServerNode(PGChildNodeView): status=401, success=0, errormsg=gettext( - u"Unable to connect to server:\n\n{}" + "Unable to connect to server:\n\n{}" ).format(errmsg) ) else: diff --git a/web/pgadmin/browser/server_groups/servers/databases/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/__init__.py index 74f6e1409..e7a69149a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/__init__.py @@ -574,7 +574,7 @@ class DatabaseView(PGChildNodeView): def create(self, gid, sid): """Create the database.""" required_args = [ - u'name' + 'name' ] data = request.form if request.form else json.loads( @@ -992,7 +992,7 @@ class DatabaseView(PGChildNodeView): Generates sql for creating new database. """ required_args = [ - u'name' + 'name' ] for arg in required_args: @@ -1183,7 +1183,7 @@ class DatabaseView(PGChildNodeView): frmtd_variables = parse_variables_from_db(res1['rows']) result.update(frmtd_variables) - sql_header = u"-- Database: {0}\n\n-- ".format(result['name']) + sql_header = "-- Database: {0}\n\n-- ".format(result['name']) sql_header += render_template( "/".join([self.template_path, self._DELETE_SQL]), diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py index fa63c8c15..34e98e103 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py @@ -606,7 +606,7 @@ class CastView(PGChildNodeView, SchemaDiffObjectCompare): data=data, conn=self.conn ) else: - return u"-- definition incomplete", None + return "-- definition incomplete", None return sql, data['srctyp'] + "->" + data["trgtyp"] @check_precondition diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py index 7b396011b..2fa5a351c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py @@ -746,7 +746,7 @@ class EventTriggerView(PGChildNodeView, SchemaDiffObjectCompare): if not status: return internal_server_error(errormsg=db_name) - sql_header = u"-- Event Trigger: {0} on database {1}\n\n-- ".format( + sql_header = "-- Event Trigger: {0} on database {1}\n\n-- ".format( result['name'], db_name ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py index 64ae9974c..94e5e0c4e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py @@ -829,7 +829,7 @@ class ForeignDataWrapperView(PGChildNodeView, SchemaDiffObjectCompare): ) sql += "\n" - sql_header = u"""-- Foreign Data Wrapper: {0}\n\n""".format( + sql_header = """-- Foreign Data Wrapper: {0}\n\n""".format( res['rows'][0]['name']) sql_header += """-- DROP FOREIGN DATA WRAPPER {0} diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py index 1aef6aca8..7f2baafb0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py @@ -837,7 +837,7 @@ class ForeignServerView(PGChildNodeView, SchemaDiffObjectCompare): conn=self.conn) sql += "\n" - sql_header = u"""-- Foreign Server: {0} + sql_header = """-- Foreign Server: {0} -- DROP SERVER {0} diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py index 63f91ff48..10c6546a8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py @@ -815,7 +815,7 @@ class UserMappingView(PGChildNodeView, SchemaDiffObjectCompare): conn=self.conn) sql += "\n" - sql_header = u"""-- User Mapping : {0} + sql_header = """-- User Mapping : {0} -- DROP USER MAPPING FOR {0} SERVER {1} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py index 68ac52fad..69d917d18 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py @@ -867,7 +867,7 @@ It may have been removed by another user. _=gettext, data=data, conn=self.conn ) - sql_header = u"-- SCHEMA: {0}\n\n-- ".format(data['name']) + sql_header = "-- SCHEMA: {0}\n\n-- ".format(data['name']) # drop schema sql_header += render_template( @@ -1051,7 +1051,7 @@ It may have been removed by another user. _=gettext, data=old_data, conn=self.conn ) - sql_header = u""" + sql_header = """ -- CATALOG: {0} -- DROP SCHEMA {0}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py index 8ba1001a3..d87f8101b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py @@ -716,7 +716,7 @@ class CollationView(PGChildNodeView, SchemaDiffObjectCompare): self._CREATE_SQL]), data=data, conn=self.conn) - sql_header = u"-- Collation: {0};\n\n-- ".format(data['name']) + sql_header = "-- Collation: {0};\n\n-- ".format(data['name']) sql_header += render_template("/".join([self.template_path, self._DELETE_SQL]), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py index ebc04bb96..3178c06fc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py @@ -753,7 +753,7 @@ AND relkind != 'c'))""" SQL = render_template("/".join([self.template_path, self._CREATE_SQL]), data=data) - sql_header = u"""-- DOMAIN: {0}.{1}\n\n""".format( + sql_header = """-- DOMAIN: {0}.{1}\n\n""".format( data['basensp'], data['name']) sql_header += """-- DROP DOMAIN {0};\n diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py index 95ef28884..071885372 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py @@ -610,7 +610,7 @@ class DomainConstraintView(PGChildNodeView): self._CREATE_SQL]), data=data, domain=domain, schema=schema) - sql_header = u"""-- CHECK: {1}.{0} + sql_header = """-- CHECK: {1}.{0} -- ALTER DOMAIN {1} DROP CONSTRAINT {0}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py index 4686b5caf..807b11e52 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py @@ -854,7 +854,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader, if not json_resp: return SQL.strip('\n') - sql_header = u"""-- FOREIGN TABLE: {0}.{1}\n\n""".format( + sql_header = """-- FOREIGN TABLE: {0}.{1}\n\n""".format( data['basensp'], data['name']) sql_header += """-- DROP FOREIGN TABLE {0}; @@ -1337,7 +1337,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader, else: columns = '*' - sql = u"SELECT {0}\n\tFROM {1};".format( + sql = "SELECT {0}\n\tFROM {1};".format( columns, self.qtIdent(self.conn, data['basensp'], data['name']) ) @@ -1377,7 +1377,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader, if len(columns) > 0: columns = ", ".join(columns) values = ", ".join(values) - sql = u"INSERT INTO {0}(\n\t{1})\n\tVALUES ({2});".format( + sql = "INSERT INTO {0}(\n\t{1})\n\tVALUES ({2});".format( self.qtIdent(self.conn, data['basensp'], data['name']), columns, values ) @@ -1422,7 +1422,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader, columns = "=?, ".join(columns) columns += "=?" - sql = u"UPDATE {0}\n\tSET {1}\n\tWHERE <condition>;".format( + sql = "UPDATE {0}\n\tSET {1}\n\tWHERE <condition>;".format( self.qtIdent(self.conn, data['basensp'], data['name']), columns ) @@ -1453,7 +1453,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader, if not data: return gone(self.not_found_error_msg()) - sql = u"DELETE FROM {0}\n\tWHERE <condition>;".format( + sql = "DELETE FROM {0}\n\tWHERE <condition>;".format( self.qtIdent(self.conn, data['basensp'], data['name']) ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py index e225c8aff..b807107b4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py @@ -661,7 +661,7 @@ class FtsConfigurationView(PGChildNodeView, SchemaDiffObjectCompare): conn=self.conn ) else: - sql = u"-- definition incomplete" + sql = "-- definition incomplete" return sql @staticmethod diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py index 23195c62f..c6a1cac2f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py @@ -659,7 +659,7 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare): conn=self.conn ) else: - sql = u"-- definition incomplete" + sql = "-- definition incomplete" return sql def _check_template_name_and_schema_name(self, data, old_data): @@ -849,7 +849,7 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare): data=res['rows'][0], conn=self.conn, is_displaying=True) - sql_header = u"""-- Text Search Dictionary: {0}.{1}\n\n""".format( + sql_header = """-- Text Search Dictionary: {0}.{1}\n\n""".format( res['rows'][0]['schema'], res['rows'][0]['name']) sql_header += """-- DROP TEXT SEARCH DICTIONARY {0};\n """.format(self.qtIdent(self.conn, res['rows'][0]['schema'], diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py index 6b214f32d..d507bf3c3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py @@ -586,7 +586,7 @@ class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare): conn=self.conn ) else: - sql = u"-- definition incomplete" + sql = "-- definition incomplete" return sql def get_sql(self, gid, sid, did, scid, data, tid=None): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py index 4dd5c1900..1edc46fad 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py @@ -1092,7 +1092,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): return resp_data # Fetch the function definition. - args = u'' + args = '' args_without_name = [] args_list = [] @@ -1183,7 +1183,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): func_def=name_with_default_args, query_for="sql_panel") - sql_header = u"""-- {0}: {1}.{2}({3})\n\n""".format( + sql_header = """-- {0}: {1}.{2}({3})\n\n""".format( object_type.upper(), resp_data['pronamespace'], resp_data['proname'], resp_data['proargtypenames'].lstrip('(').rstrip(')')) @@ -1470,7 +1470,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): # Parse Privileges self._parse_privilege_data(data) - args = u'' + args = '' args_without_name = [] args_list = [] diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py index a823d1d7a..96522d6a5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py @@ -366,8 +366,8 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare): """ required_args = [ - u'name', - u'pkgheadsrc' + 'name', + 'pkgheadsrc' ] data = request.form if request.form else json.loads( @@ -622,7 +622,7 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare): :return: """ required_args = [ - u'name' + 'name' ] sql = render_template( "/".join([self.template_path, self._PROPERTIES_SQL]), scid=scid, @@ -734,7 +734,7 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare): if not json_resp: return sql - sql_header = u"-- Package: {0}.{1}\n\n-- ".format( + sql_header = "-- Package: {0}.{1}\n\n-- ".format( self.schema, result['name']) sql_header += render_template( diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py index 1ec612d1f..2939fe21f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py @@ -529,7 +529,7 @@ class EdbFuncView(PGChildNodeView, DataTypeReader): if not status: return internal_server_error(errormsg=res) - sql = u"-- Package {}: {}".format( + sql = "-- Package {}: {}".format( 'Function' if self.node_type == 'edbfunc' else 'Procedure', name) if body != '': diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py index 5a201ab3b..ef206e4a2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py @@ -319,9 +319,9 @@ class EdbVarView(PGChildNodeView, DataTypeReader): var = res['rows'][0] - sql = u"-- Package Variable: {}".format(var['name']) - sql += u"\n\n" - sql += u"{} {};".format(var['name'], var['datatype']) + sql = "-- Package Variable: {}".format(var['name']) + sql += "\n\n" + sql += "{} {};".format(var['name'], var['datatype']) return ajax_response(response=sql) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py index e2cf25123..8c7a378ef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py @@ -371,9 +371,9 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare): """ required_args = [ - u'name', - u'schema', - u'seqowner', + 'name', + 'schema', + 'seqowner', ] data = request.form if request.form else json.loads( @@ -620,7 +620,7 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare): """ required_args = [ - u'name' + 'name' ] if seid is not None: @@ -737,7 +737,7 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare): if not json_resp: return sql - sql_header = u"""-- SEQUENCE: {0}.{1}\n\n""".format( + sql_header = """-- SEQUENCE: {0}.{1}\n\n""".format( result['schema'], result['name']) sql_header += """-- DROP SEQUENCE {0}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py index cc3ae604d..9f18525dd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py @@ -1426,7 +1426,7 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings, else: columns = '*' - sql = u"SELECT {0}\n\tFROM {1};".format( + sql = "SELECT {0}\n\tFROM {1};".format( columns, self.qtIdent(self.conn, data['schema'], data['name']) ) @@ -1474,7 +1474,7 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings, if len(columns) > 0: columns = ", ".join(columns) values = ", ".join(values) - sql = u"INSERT INTO {0}(\n\t{1})\n\tVALUES ({2});".format( + sql = "INSERT INTO {0}(\n\t{1})\n\tVALUES ({2});".format( self.qtIdent(self.conn, data['schema'], data['name']), columns, values ) @@ -1527,7 +1527,7 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings, columns = "=?, ".join(columns) columns += "=?" - sql = u"UPDATE {0}\n\tSET {1}\n\tWHERE <condition>;".format( + sql = "UPDATE {0}\n\tSET {1}\n\tWHERE <condition>;".format( self.qtIdent(self.conn, data['schema'], data['name']), columns ) @@ -1565,7 +1565,7 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings, data = res['rows'][0] - sql = u"DELETE FROM {0}\n\tWHERE <condition>;".format( + sql = "DELETE FROM {0}\n\tWHERE <condition>;".format( self.qtIdent(self.conn, data['schema'], data['name']) ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py index e1fbeff6c..63e01d822 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py @@ -754,7 +754,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader): if not isinstance(SQL, str): return SQL - sql_header = u"-- Column: {0}\n\n-- ".format( + sql_header = "-- Column: {0}\n\n-- ".format( self.qtIdent( self.conn, data['schema'], data['table'], data['name']) ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/utils.py index 7ecc6d5c4..a3c89afe9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/utils.py @@ -181,7 +181,7 @@ def get_reverse_engineered_sql(conn, **kwargs): SQL, name = get_sql(conn, data, tid, None, datlastsysoid) - sql_header = u"-- Compound Trigger: {0}\n\n-- ".format(data['name']) + sql_header = "-- Compound Trigger: {0}\n\n-- ".format(data['name']) sql_header += render_template("/".join([template_path, 'delete.sql']), data=data, conn=conn) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py index 9e291a954..6ffa693ff 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py @@ -737,7 +737,7 @@ class CheckConstraintView(PGChildNodeView): self._CREATE_SQL]), data=data) - sql_header = u"-- Constraint: {0}\n\n-- ".format(data['name']) + sql_header = "-- Constraint: {0}\n\n-- ".format(data['name']) sql_header += render_template( "/".join([self.template_path, self._DELETE_SQL]), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py index 397d1f297..e5542bb0e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py @@ -832,7 +832,7 @@ class ExclusionConstraintView(PGChildNodeView): SQL = render_template( "/".join([self.template_path, self._CREATE_SQL]), data=data) - sql_header = u"-- Constraint: {0}\n\n-- ".format(data['name']) + sql_header = "-- Constraint: {0}\n\n-- ".format(data['name']) sql_header += render_template( "/".join([self.template_path, self._DELETE_SQL]), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py index 5bd15ddc3..611758194 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py @@ -876,7 +876,7 @@ class ForeignKeyConstraintView(PGChildNodeView): SQL = render_template( "/".join([self.template_path, self._CREATE_SQL]), data=data) - sql_header = u"-- Constraint: {0}\n\n-- ".format(data['name']) + sql_header = "-- Constraint: {0}\n\n-- ".format(data['name']) sql_header += render_template( "/".join([self.template_path, self._DELETE_SQL]), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py index 4f601306e..1f79e8959 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py @@ -512,7 +512,7 @@ class IndexConstraintView(PGChildNodeView): @staticmethod def _check_required_args(data): required_args = [ - [u'columns', u'index'] # Either of one should be there. + ['columns', 'index'] # Either of one should be there. ] def is_key_list(key, data): @@ -878,7 +878,7 @@ class IndexConstraintView(PGChildNodeView): data=data, constraint_name=self.constraint_name) - sql_header = u"-- Constraint: {0}\n\n-- ".format(data['name']) + sql_header = "-- Constraint: {0}\n\n-- ".format(data['name']) sql_header += render_template( "/".join([self.template_path, self._DELETE_SQL]), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/utils.py index 3f3ceff47..39c1d2d8b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/utils.py @@ -235,7 +235,7 @@ def _check_required_args(data, name): :return: If any error return error. """ required_args = [ - [u'columns', u'index'] # Either of one should be there. + ['columns', 'index'] # Either of one should be there. ] def is_key_list(key, data): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py index d67f11d4d..87c0fd7b2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/utils.py @@ -311,7 +311,7 @@ def get_reverse_engineered_sql(conn, **kwargs): datlastsysoid=datlastsysoid) if with_header: - sql_header = u"-- Index: {0}\n\n-- ".format(data['name']) + sql_header = "-- Index: {0}\n\n-- ".format(data['name']) sql_header += render_template("/".join([template_path, 'delete.sql']), data=data, conn=conn) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/utils.py index 8cfaa3906..2375ef9f0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/utils.py @@ -133,7 +133,7 @@ def get_reverse_engineered_sql(conn, **kwargs): datlastsysoid=datlastsysoid, schema=schema, table=table) if with_header: - sql_header = u"-- POLICY: {0}\n\n-- ".format(data['name']) + sql_header = "-- POLICY: {0}\n\n-- ".format(data['name']) sql_header += render_template("/".join([template_path, 'delete.sql']), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py index 7fe3aabc0..1be5d9cdc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py @@ -52,7 +52,7 @@ class TestTablesPropertiesSql(SQLTemplateTestBase): return sql def test_setup(self, connection, cursor): - cursor.execute(u""" + cursor.execute(""" SELECT db.oid as did, datlastsysoid FROM diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/utils.py index 0db7e433b..452551e55 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/utils.py @@ -292,7 +292,7 @@ def get_reverse_engineered_sql(conn, **kwargs): show_system_objects=show_system_objects) if with_header: - sql_header = u"-- Trigger: {0}\n\n-- ".format(data['name']) + sql_header = "-- Trigger: {0}\n\n-- ".format(data['name']) sql_header += render_template("/".join([template_path, 'delete.sql']), data=data, conn=conn) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py index 647a7ba5c..bf3344afa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py @@ -467,7 +467,7 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): self._format_column_list(data) if json_resp: - sql_header = u"-- Table: {0}.{1}\n\n-- ".format( + sql_header = "-- Table: {0}.{1}\n\n-- ".format( data['schema'], data['name']) sql_header += render_template("/".join([self.table_template_path, @@ -520,7 +520,7 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): self.conn, schema=schema, table=table, did=did, tid=tid, idx=row['oid'], datlastsysoid=self.datlastsysoid, template_path=None, with_header=json_resp) - index_sql = u"\n" + index_sql + index_sql = "\n" + index_sql # Add into main sql index_sql = re.sub('\n{2,}', '\n\n', index_sql) @@ -549,7 +549,7 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): self.conn, schema=schema, table=table, scid=scid, plid=row['oid'], datlastsysoid=self.datlastsysoid, template_path=None, with_header=json_resp) - policy_sql = u"\n" + policy_sql + policy_sql = "\n" + policy_sql # Add into main sql policy_sql = re.sub('\n{2,}', '\n\n', policy_sql) @@ -575,7 +575,7 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): trid=row['oid'], datlastsysoid=self.datlastsysoid, show_system_objects=self.blueprint.show_system_objects, template_path=None, with_header=json_resp) - trigger_sql = u"\n" + trigger_sql + trigger_sql = "\n" + trigger_sql # Add into main sql trigger_sql = re.sub('\n{2,}', '\n\n', trigger_sql) @@ -603,7 +603,7 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): compound_trigger_utils.get_reverse_engineered_sql( self.conn, schema=schema, table=table, tid=tid, trid=row['oid'], datlastsysoid=self.datlastsysoid) - compound_trigger_sql = u"\n" + compound_trigger_sql + compound_trigger_sql = "\n" + compound_trigger_sql # Add into main sql compound_trigger_sql = \ @@ -661,7 +661,7 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): sql_header = '' if len(rset['rows']): if json_resp: - sql_header = u"\n-- Partitions SQL" + sql_header = "\n-- Partitions SQL" partition_sql = '' for row in rset['rows']: part_data = dict() diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py index f95355d39..8dc2384e8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py @@ -1424,7 +1424,7 @@ class TypeView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): if not isinstance(SQL, str): return SQL # We are appending headers here for sql panel - sql_header = u"-- Type: {0}\n\n-- ".format(data['name']) + sql_header = "-- Type: {0}\n\n-- ".format(data['name']) sql_header += render_template("/".join([self.template_path, self._DELETE_SQL]), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py index 589812923..fa2198cc1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py @@ -1569,7 +1569,7 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare): else: columns = '*' - sql = u"SELECT {0}\n\tFROM {1};".format( + sql = "SELECT {0}\n\tFROM {1};".format( columns, self.qtIdent(self.conn, data_view['schema'], data_view['name']) ) @@ -1629,7 +1629,7 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare): if len(columns) > 0: columns = ", ".join(columns) values = ", ".join(values) - sql = u"INSERT INTO {0}(\n\t{1})\n\tVALUES ({2});".format( + sql = "INSERT INTO {0}(\n\t{1})\n\tVALUES ({2});".format( self.qtIdent( self.conn, data_view['schema'], data_view['name'] ), diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py b/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py index 4c9550332..be175cda3 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py @@ -271,7 +271,7 @@ SELECT EXISTS( def create(self, gid, sid): """Create the pgAgent job.""" required_args = [ - u'jobname' + 'jobname' ] data = request.form if request.form else json.loads( diff --git a/web/pgadmin/browser/server_groups/servers/roles/__init__.py b/web/pgadmin/browser/server_groups/servers/roles/__init__.py index e2f7aa935..c68728430 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/roles/__init__.py @@ -145,10 +145,10 @@ class RoleView(PGChildNodeView): if not isinstance(data, dict): return False - for op in [u'added', u'deleted', u'changed']: + for op in ['added', 'deleted', 'changed']: op_data = data.get(op, []) check_keys = req_add_keys \ - if op in [u'added', u'changed'] else req_delete_keys + if op in ['added', 'changed'] else req_delete_keys if not self._validate_input_dict_for_new(op_data, check_keys): return False @@ -160,15 +160,15 @@ class RoleView(PGChildNodeView): :param data: role data :return: valid or invalid message """ - if u'rolvaliduntil' in data: + if 'rolvaliduntil' in data: # Make date explicit so that it works with every # postgres database datestyle format try: - if data[u'rolvaliduntil'] is not None and \ - data[u'rolvaliduntil'] != '' and \ - len(data[u'rolvaliduntil']) > 0: - data[u'rolvaliduntil'] = dateutil_parser.parse( - data[u'rolvaliduntil'] + if data['rolvaliduntil'] is not None and \ + data['rolvaliduntil'] != '' and \ + len(data['rolvaliduntil']) > 0: + data['rolvaliduntil'] = dateutil_parser.parse( + data['rolvaliduntil'] ).isoformat() except Exception: return _("Date format is invalid.") @@ -181,15 +181,15 @@ class RoleView(PGChildNodeView): :param data: role data :return: valid or invalid message """ - if u'rolconnlimit' in data: + if 'rolconnlimit' in data: # If roleconnlimit is empty string then set it to -1 - if data[u'rolconnlimit'] == '': - data[u'rolconnlimit'] = -1 + if data['rolconnlimit'] == '': + data['rolconnlimit'] = -1 - if data[u'rolconnlimit'] is not None: - data[u'rolconnlimit'] = int(data[u'rolconnlimit']) - if not isinstance(data[u'rolconnlimit'], int) or \ - data[u'rolconnlimit'] < -1: + if data['rolconnlimit'] is not None: + data['rolconnlimit'] = int(data['rolconnlimit']) + if not isinstance(data['rolconnlimit'], int) or \ + data['rolconnlimit'] < -1: return _("Connection limit must be an integer value " "or equal to -1.") return None @@ -209,31 +209,31 @@ class RoleView(PGChildNodeView): return ret_val if id == -1: - data[u'members'] = [] - data[u'admins'] = [] + data['members'] = [] + data['admins'] = [] - data[u'admins'] = _part_dict_list( - data[u'rolmembership'], lambda d: d[u'admin'], u'role') - data[u'members'] = _part_dict_list( - data[u'rolmembership'], lambda d: not d[u'admin'], u'role') + data['admins'] = _part_dict_list( + data['rolmembership'], lambda d: d['admin'], 'role') + data['members'] = _part_dict_list( + data['rolmembership'], lambda d: not d['admin'], 'role') else: - data[u'admins'] = _part_dict_list( - data[u'rolmembership'].get(u'added', []), - lambda d: d[u'admin'], u'role') - data[u'members'] = _part_dict_list( - data[u'rolmembership'].get(u'added', []), - lambda d: not d[u'admin'], u'role') - - data[u'admins'].extend(_part_dict_list( - data[u'rolmembership'].get(u'changed', []), - lambda d: d[u'admin'], u'role')) - data[u'revoked_admins'] = _part_dict_list( - data[u'rolmembership'].get(u'changed', []), - lambda d: not d[u'admin'], u'role') - - data[u'revoked'] = _part_dict_list( - data[u'rolmembership'].get(u'deleted', []), - lambda _: True, u'role') + data['admins'] = _part_dict_list( + data['rolmembership'].get('added', []), + lambda d: d['admin'], 'role') + data['members'] = _part_dict_list( + data['rolmembership'].get('added', []), + lambda d: not d['admin'], 'role') + + data['admins'].extend(_part_dict_list( + data['rolmembership'].get('changed', []), + lambda d: d['admin'], 'role')) + data['revoked_admins'] = _part_dict_list( + data['rolmembership'].get('changed', []), + lambda d: not d['admin'], 'role') + + data['revoked'] = _part_dict_list( + data['rolmembership'].get('deleted', []), + lambda _: True, 'role') def _validate_rolemembership(self, id, data): """ @@ -241,7 +241,7 @@ class RoleView(PGChildNodeView): :param data: role data :return: valid or invalid message """ - if u'rolmembership' not in data: + if 'rolmembership' not in data: return None if id == -1: @@ -257,7 +257,7 @@ rolmembership:[{ ]""") if not self._validate_input_dict_for_new( - data[u'rolmembership'], [u'role', u'admin']): + data['rolmembership'], ['role', 'admin']): return msg self._process_rolemembership(id, data) @@ -287,7 +287,7 @@ rolmembership:{ ] """) if not self._validate_input_dict_for_update( - data[u'rolmembership'], [u'role', u'admin'], [u'role']): + data['rolmembership'], ['role', 'admin'], ['role']): return msg self._process_rolemembership(id, data) @@ -299,7 +299,7 @@ rolmembership:{ :param data: role data :return: valid or invalid message """ - if u'seclabels' not in data or self.manager.version < 90200: + if 'seclabels' not in data or self.manager.version < 90200: return None if id == -1: @@ -313,7 +313,7 @@ seclabels:[{ ... ]""") if not self._validate_input_dict_for_new( - data[u'seclabels'], [u'provider', u'label']): + data['seclabels'], ['provider', 'label']): return msg return None @@ -342,7 +342,7 @@ seclabels:{ ] """) if not self._validate_input_dict_for_update( - data[u'seclabels'], [u'provider', u'label'], [u'provider']): + data['seclabels'], ['provider', 'label'], ['provider']): return msg return None @@ -353,7 +353,7 @@ seclabels:{ :param data: role data :return: valid or invalid message """ - if u'variables' not in data: + if 'variables' not in data: return None if id == -1: @@ -368,7 +368,7 @@ value: <value> ... ]""") if not self._validate_input_dict_for_new( - data[u'variables'], [u'name', u'value']): + data['variables'], ['name', 'value']): return msg return None @@ -400,7 +400,7 @@ rolmembership:{ ] """) if not self._validate_input_dict_for_update( - data[u'variables'], [u'name', u'value'], [u'name']): + data['variables'], ['name', 'value'], ['name']): return msg return None @@ -410,7 +410,7 @@ rolmembership:{ :param data: role data :return: valid or invalid message """ - if (id == -1) and u'rolname' not in data: + if (id == -1) and 'rolname' not in data: return precondition_required( _("Name must be specified.") ) @@ -429,10 +429,10 @@ rolmembership:{ val = req[key] if key in [ - u'rolcanlogin', u'rolsuper', u'rolcreatedb', - u'rolcreaterole', u'rolinherit', u'rolreplication', - u'rolcatupdate', u'variables', u'rolmembership', - u'seclabels' + 'rolcanlogin', 'rolsuper', 'rolcreatedb', + 'rolcreaterole', 'rolinherit', 'rolreplication', + 'rolcatupdate', 'variables', 'rolmembership', + 'seclabels' ]: data[key] = json.loads(val, encoding='utf-8') else: @@ -451,17 +451,17 @@ rolmembership:{ return precondition_required(invalid_msg) invalid_msg = self._validate_rolemembership( - kwargs.get(u'rid', -1), data) + kwargs.get('rid', -1), data) if invalid_msg is not None: return precondition_required(invalid_msg) invalid_msg = self._validate_seclabels( - kwargs.get(u'rid', -1), data) + kwargs.get('rid', -1), data) if invalid_msg is not None: return precondition_required(invalid_msg) invalid_msg = self._validate_variables( - kwargs.get(u'rid', -1), data) + kwargs.get('rid', -1), data) if invalid_msg is not None: return precondition_required(invalid_msg) @@ -581,13 +581,13 @@ rolmembership:{ self.sql_path = 'roles/sql/#{0}#'.format(self.manager.version) self.alterKeys = [ - u'rolcanlogin', u'rolsuper', u'rolcreatedb', - u'rolcreaterole', u'rolinherit', u'rolreplication', - u'rolconnlimit', u'rolvaliduntil', u'rolpassword' + 'rolcanlogin', 'rolsuper', 'rolcreatedb', + 'rolcreaterole', 'rolinherit', 'rolreplication', + 'rolconnlimit', 'rolvaliduntil', 'rolpassword' ] if self.manager.version >= 90200 else [ - u'rolcanlogin', u'rolsuper', u'rolcreatedb', - u'rolcreaterole', u'rolinherit', u'rolconnlimit', - u'rolvaliduntil', u'rolpassword' + 'rolcanlogin', 'rolsuper', 'rolcreatedb', + 'rolcreaterole', 'rolinherit', 'rolconnlimit', + 'rolvaliduntil', 'rolpassword' ] fetch_name, check_permission, \ @@ -781,7 +781,7 @@ rolmembership:{ row = res['rows'][0] status, res = self.conn.execute_2darray( - u"DROP ROLE {0};".format(self.qtIdent(self.conn, + "DROP ROLE {0};".format(self.qtIdent(self.conn, row['rolname'])) ) if not status: @@ -836,7 +836,7 @@ rolmembership:{ status, rid = self.conn.execute_scalar( "SELECT oid FROM pg_roles WHERE rolname = %(rolname)s", - {'rolname': self.request[u'rolname']} + {'rolname': self.request['rolname']} ) if not status: diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py index cb384c350..83b5a8bc7 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py @@ -578,7 +578,7 @@ class TablespaceView(PGChildNodeView): data=old_data, conn=self.conn ) - sql_header = u""" + sql_header = """ -- Tablespace: {0} -- DROP TABLESPACE {0}; diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py index a635d2a68..c9d629271 100644 --- a/web/pgadmin/misc/bgprocess/processes.py +++ b/web/pgadmin/misc/bgprocess/processes.py @@ -208,26 +208,26 @@ class BatchProcess(object): ) executor = file_quote(os.path.join( - os.path.dirname(u_encode(__file__)), u'process_executor.py' + os.path.dirname(u_encode(__file__)), 'process_executor.py' )) paths = os.environ['PATH'].split(os.pathsep) interpreter = None current_app.logger.info( - u"Process Executor: Operating System Path %s", + "Process Executor: Operating System Path %s", str(paths) ) if os.name == 'nt': - paths.insert(0, os.path.join(u_encode(sys.prefix), u'Scripts')) + paths.insert(0, os.path.join(u_encode(sys.prefix), 'Scripts')) paths.insert(0, u_encode(sys.prefix)) - interpreter = which(u'pythonw.exe', paths) + interpreter = which('pythonw.exe', paths) if interpreter is None: - interpreter = which(u'python.exe', paths) + interpreter = which('python.exe', paths) current_app.logger.info( - u"Process Executor: Interpreter value in path: %s", + "Process Executor: Interpreter value in path: %s", str(interpreter) ) if interpreter is None and current_app.PGADMIN_RUNTIME: @@ -245,16 +245,16 @@ class BatchProcess(object): bin_path = os.path.dirname(sys.executable) venv = os.path.realpath( - os.path.join(bin_path, u'..\\venv') + os.path.join(bin_path, '..\\venv') ) - interpreter = which(u'pythonw.exe', [venv]) + interpreter = which('pythonw.exe', [venv]) if interpreter is None: - interpreter = which(u'python.exe', [venv]) + interpreter = which('python.exe', [venv]) current_app.logger.info( - u"Process Executor: Interpreter value in virtual " - u"environment: %s", str(interpreter) + "Process Executor: Interpreter value in virtual " + "environment: %s", str(interpreter) ) if interpreter is not None: @@ -272,7 +272,7 @@ class BatchProcess(object): # directory in the PATH environment variable. Hence - it will # 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')) + paths.insert(0, os.path.join(u_encode(sys.prefix), 'bin')) python_binary_name = 'python{0}'.format(sys.version_info[0]) interpreter = which(u_encode(python_binary_name), paths) @@ -284,7 +284,7 @@ class BatchProcess(object): cmd.extend(self.args) current_app.logger.info( - u"Executing the process executor with the arguments: %s", + "Executing the process executor with the arguments: %s", str(cmd) ) diff --git a/web/pgadmin/misc/file_manager/__init__.py b/web/pgadmin/misc/file_manager/__init__.py index b51f583d8..955f98073 100644 --- a/web/pgadmin/misc/file_manager/__init__.py +++ b/web/pgadmin/misc/file_manager/__init__.py @@ -392,9 +392,9 @@ class Filemanager(object): if last_dir is not None: check_dir_exists = True else: - last_dir = u"/" + last_dir = "/" - if not config.SERVER_MODE and last_dir == u"/" or last_dir == "/": + if not config.SERVER_MODE and last_dir == "/" or last_dir == "/": last_dir = homedir if check_dir_exists: @@ -412,14 +412,14 @@ class Filemanager(object): index = last_dir.rfind('/') last_dir = last_dir[0:index] if not last_dir: - last_dir = u"/" + last_dir = "/" if _platform == 'win32': if not (last_dir.endswith('\\') or last_dir.endswith('/')): - last_dir += u"\\" + last_dir += "\\" else: if not last_dir.endswith('/'): - last_dir += u"/" + last_dir += "/" # create configs using above configs configs = { @@ -516,13 +516,13 @@ class Filemanager(object): bitmask >>= 1 if (drive_name != '' and drive_name is not None and drive_name in drives): - return u"{0}{1}".format(drive_name, ':') + return "{0}{1}".format(drive_name, ':') else: return drives # return drives if no argument is passed except Exception: return ['C:'] else: - return u'/' + return '/' @staticmethod def suspend_windows_warning(): @@ -557,7 +557,7 @@ class Filemanager(object): Filemanager.check_access_permission(in_dir, path) except Exception as e: Filemanager.resume_windows_warning() - err_msg = gettext(u"Error: {0}").format(e) + err_msg = gettext("Error: {0}").format(e) files = { 'Code': 0, 'Error': err_msg @@ -570,7 +570,7 @@ class Filemanager(object): drives = Filemanager._get_drives() for drive in drives: protected = 0 - path = file_name = u"{0}:".format(drive) + path = file_name = "{0}:".format(drive) try: drive_size = getdrivesize(path) drive_size_in_units = sizeof_fmt(drive_size) @@ -597,7 +597,7 @@ class Filemanager(object): Filemanager.resume_windows_warning() return { 'Code': 0, - 'Error': gettext(u"'{0}' file does not exist.").format(path) + 'Error': gettext("'{0}' file does not exist.").format(path) } user_dir = path @@ -634,8 +634,8 @@ class Filemanager(object): if os.path.isdir(system_path): if files_only == 'true': continue - file_extension = u"dir" - user_path = u"{0}/".format(user_path) + file_extension = "dir" + user_path = "{0}/".format(user_path) else: # filter files based on file_type if file_type is not None and file_type != "*" and \ @@ -660,9 +660,9 @@ class Filemanager(object): Filemanager.resume_windows_warning() if (hasattr(e, 'strerror') and e.strerror == gettext('Permission denied')): - err_msg = gettext(u"Error: {0}").format(e.strerror) + err_msg = gettext("Error: {0}").format(e.strerror) else: - err_msg = gettext(u"Error: {0}").format(e) + err_msg = gettext("Error: {0}").format(e) files = { 'Code': 0, 'Error': err_msg @@ -694,7 +694,7 @@ class Filemanager(object): # in server mode. if not orig_path.startswith(in_dir): raise InternalServerError( - gettext(u"Access denied ({0})").format(path)) + gettext("Access denied ({0})").format(path)) return True @staticmethod @@ -702,30 +702,30 @@ class Filemanager(object): if (path.startswith('\\\\') and _platform == 'win32')\ or config.SERVER_MODE is False or in_dir is None: - return u"{}".format(path) + return "{}".format(path) if path == '/' or path == '\\': if _platform == 'win32': if in_dir.endswith('\\') or in_dir.endswith('/'): - return u"{}".format(in_dir) + return "{}".format(in_dir) else: - return u"{}{}".format(in_dir, '\\') + return "{}{}".format(in_dir, '\\') else: if in_dir.endswith('/'): - return u"{}".format(in_dir) + return "{}".format(in_dir) else: - return u"{}{}".format(in_dir, '/') + return "{}{}".format(in_dir, '/') if in_dir.endswith('/') or in_dir.endswith('\\'): if path.startswith('/') or path.startswith('\\'): - return u"{}{}".format(in_dir[:-1], path) + return "{}{}".format(in_dir[:-1], path) else: - return u"{}/{}".format(in_dir, path) + return "{}/{}".format(in_dir, path) else: if path.startswith('/') or path.startswith('\\'): - return u"{}{}".format(in_dir, path) + return "{}{}".format(in_dir, path) else: - return u"{}/{}".format(in_dir, path) + return "{}/{}".format(in_dir, path) def validate_request(self, capability): """ @@ -743,7 +743,7 @@ class Filemanager(object): path = unquote(path) if self.dir is None: self.dir = "" - orig_path = u"{0}{1}".format(self.dir, path) + orig_path = "{0}{1}".format(self.dir, path) try: Filemanager.check_access_permission(self.dir, path) @@ -752,7 +752,7 @@ class Filemanager(object): 'Filename': split_path(path)[-1], 'FileType': '', 'Path': path, - 'Error': gettext(u"Error: {0}").format(e), + 'Error': gettext("Error: {0}").format(e), 'Code': 0, 'Info': '', 'Properties': { @@ -784,7 +784,7 @@ class Filemanager(object): if not path_exists(orig_path): thefile['Error'] = gettext( - u"'{0}' file does not exist.").format(path) + "'{0}' file does not exist.").format(path) thefile['Code'] = -1 return thefile @@ -813,7 +813,7 @@ class Filemanager(object): if config.SERVER_MODE: the_dir = self.dir if the_dir is not None and not the_dir.endswith('/'): - the_dir += u'/' + the_dir += '/' filelist = self.list_filesystem( the_dir, path, trans_data, file_type, show_hidden) @@ -836,7 +836,7 @@ class Filemanager(object): Filemanager.check_access_permission(the_dir, new) except Exception as e: res = { - 'Error': gettext(u"Error: {0}").format(e), + 'Error': gettext("Error: {0}").format(e), 'Code': 0 } return res @@ -851,23 +851,23 @@ class Filemanager(object): path = split_path(path)[0] # extract path if not path[-1] == '/': - path += u'/' + path += '/' newname = new newpath = path + newname # make system old path - oldpath_sys = u"{0}{1}".format(the_dir, old) - newpath_sys = u"{0}{1}".format(the_dir, newpath) + oldpath_sys = "{0}{1}".format(the_dir, old) + newpath_sys = "{0}{1}".format(the_dir, newpath) - error_msg = gettext(u'Renamed successfully.') + error_msg = gettext('Renamed successfully.') code = 1 try: os.rename(oldpath_sys, newpath_sys) except Exception as e: code = 0 - error_msg = u"{0} {1}".format( - gettext(u'There was an error renaming the file:'), e) + error_msg = "{0} {1}".format( + gettext('There was an error renaming the file:'), e) result = { 'Old Path': old, @@ -891,13 +891,13 @@ class Filemanager(object): } the_dir = self.dir if self.dir is not None else '' - orig_path = u"{0}{1}".format(the_dir, path) + orig_path = "{0}{1}".format(the_dir, path) try: Filemanager.check_access_permission(the_dir, path) except Exception as e: res = { - 'Error': gettext(u"Error: {0}").format(e), + 'Error': gettext("Error: {0}").format(e), 'Code': 0 } return res @@ -911,7 +911,7 @@ class Filemanager(object): os.remove(orig_path) except Exception as e: code = 0 - err_msg = gettext(u"Error: {0}").format(e.strerror) + err_msg = gettext("Error: {0}").format(e.strerror) result = { 'Path': path, @@ -939,8 +939,8 @@ class Filemanager(object): file_obj = req.files['newfile'] file_name = file_obj.filename - orig_path = u"{0}{1}".format(the_dir, path) - new_name = u"{0}{1}".format(orig_path, file_name) + orig_path = "{0}{1}".format(the_dir, path) + new_name = "{0}{1}".format(orig_path, file_name) with open(new_name, 'wb') as f: while True: @@ -951,14 +951,14 @@ class Filemanager(object): f.write(data) except Exception as e: code = 0 - err_msg = gettext(u"Error: {0}").format( - e.strerror if hasattr(e, 'strerror') else gettext(u'Unknown')) + err_msg = gettext("Error: {0}").format( + e.strerror if hasattr(e, 'strerror') else gettext('Unknown')) try: Filemanager.check_access_permission(the_dir, path) except Exception as e: res = { - 'Error': gettext(u"Error: {0}").format(e), + 'Error': gettext("Error: {0}").format(e), 'Code': 0 } return res @@ -982,19 +982,19 @@ class Filemanager(object): name = unquote(name) path = unquote(path) try: - orig_path = u"{0}{1}".format(the_dir, path) + orig_path = "{0}{1}".format(the_dir, path) Filemanager.check_access_permission( - the_dir, u"{}{}".format(path, name)) + the_dir, "{}{}".format(path, name)) - new_name = u"{0}{1}".format(orig_path, name) + new_name = "{0}{1}".format(orig_path, name) if not os.path.exists(new_name): code = 0 except Exception as e: code = 0 if hasattr(e, 'strerror'): - err_msg = gettext(u"Error: {0}").format(e.strerror) + err_msg = gettext("Error: {0}").format(e.strerror) else: - err_msg = gettext(u"Error: {0}").format(e) + err_msg = gettext("Error: {0}").format(e) result = { 'Path': path, @@ -1012,12 +1012,12 @@ class Filemanager(object): with same name already exists """ last_char = new_name[-1] - t_new_path = u"{}/{}{}_{}".format(in_dir, path, new_name, count) + t_new_path = "{}/{}{}_{}".format(in_dir, path, new_name, count) if last_char == 'r' and not path_exists(t_new_path): return t_new_path, new_name else: last_char = int(t_new_path[-1]) + 1 - new_path = u"{}/{}{}_{}".format(in_dir, path, new_name, last_char) + new_path = "{}/{}{}_{}".format(in_dir, path, new_name, last_char) if path_exists(new_path): count += 1 return Filemanager.get_new_name(in_dir, path, new_name, count) @@ -1084,13 +1084,13 @@ class Filemanager(object): # we don't want to expose real path of file # so only show error message. if ex.strerror == 'Permission denied': - err_msg = gettext(u"Error: {0}").format(ex.strerror) + err_msg = gettext("Error: {0}").format(ex.strerror) else: - err_msg = gettext(u"Error: {0}").format(str(ex)) + err_msg = gettext("Error: {0}").format(str(ex)) except Exception as ex: status = False - err_msg = gettext(u"Error: {0}").format(str(ex)) + err_msg = gettext("Error: {0}").format(str(ex)) # Remove root storage path from error message # when running in Server mode @@ -1114,19 +1114,19 @@ class Filemanager(object): the_dir = self.dir if self.dir is not None else '' try: - Filemanager.check_access_permission(the_dir, u"{}{}".format( + Filemanager.check_access_permission(the_dir, "{}{}".format( path, name)) except Exception as e: res = { - 'Error': gettext(u"Error: {0}").format(e), + 'Error': gettext("Error: {0}").format(e), 'Code': 0 } return res if the_dir != "": - new_path = u"{}/{}{}/".format(the_dir, path, name) + new_path = "{}/{}{}/".format(the_dir, path, name) else: - new_path = u"{}{}/".format(path, name) + new_path = "{}{}/".format(path, name) err_msg = '' code = 1 @@ -1136,14 +1136,14 @@ class Filemanager(object): os.mkdir(new_path) except Exception as e: code = 0 - err_msg = gettext(u"Error: {0}").format(e.strerror) + err_msg = gettext("Error: {0}").format(e.strerror) else: new_path, new_name = self.get_new_name(the_dir, path, name) try: os.mkdir(new_path) except Exception as e: code = 0 - err_msg = gettext(u"Error: {0}").format(e.strerror) + err_msg = gettext("Error: {0}").format(e.strerror) result = { 'Parent': path, @@ -1165,14 +1165,14 @@ class Filemanager(object): } the_dir = self.dir if self.dir is not None else '' - orig_path = u"{0}{1}".format(the_dir, path) + orig_path = "{0}{1}".format(the_dir, path) try: Filemanager.check_access_permission( - the_dir, u"{}{}".format(path, path) + the_dir, "{}{}".format(path, path) ) except Exception as e: - resp = Response(gettext(u"Error: {0}").format(e)) + resp = Response(gettext("Error: {0}").format(e)) resp.headers['Content-Disposition'] = \ 'attachment; filename=' + name return resp @@ -1189,7 +1189,7 @@ class Filemanager(object): try: Filemanager.check_access_permission(the_dir, path) except Exception as e: - err_msg = gettext(u"Error: {0}").format(e) + err_msg = gettext("Error: {0}").format(e) res['Code'] = 0 res['Error'] = err_msg return res diff --git a/web/pgadmin/setup/db_upgrade.py b/web/pgadmin/setup/db_upgrade.py index b92591936..f09f50e95 100644 --- a/web/pgadmin/setup/db_upgrade.py +++ b/web/pgadmin/setup/db_upgrade.py @@ -20,6 +20,6 @@ def db_upgrade(app): migration_folder = os.path.join( os.path.dirname(os.path.realpath(u_encode(__file__, fs_encoding))), os.pardir, os.pardir, - u'migrations' + 'migrations' ) flask_migrate.upgrade(migration_folder) diff --git a/web/pgadmin/setup/user_info.py b/web/pgadmin/setup/user_info.py index b439ecbaa..ab38e567a 100644 --- a/web/pgadmin/setup/user_info.py +++ b/web/pgadmin/setup/user_info.py @@ -16,7 +16,7 @@ import getpass def user_info_desktop(): - print(u"NOTE: Configuring authentication for DESKTOP mode.") + print("NOTE: Configuring authentication for DESKTOP mode.") email = config.DESKTOP_USER p1 = ''.join([ random.choice(string.ascii_letters + string.digits) @@ -26,7 +26,7 @@ def user_info_desktop(): def user_info_server(): - print(u"NOTE: Configuring authentication for SERVER mode.\n") + print("NOTE: Configuring authentication for SERVER mode.\n") if all(value in os.environ for value in ['PGADMIN_SETUP_EMAIL', 'PGADMIN_SETUP_PASSWORD']): @@ -39,8 +39,8 @@ def user_info_server(): else: # Prompt the user for their default username and password. print( - u"Enter the email address and password to use for the initial " - u"pgAdmin user account:\n" + "Enter the email address and password to use for the initial " + "pgAdmin user account:\n" ) email_filter = re.compile( @@ -51,7 +51,7 @@ def user_info_server(): email = input("Email address: ") while email == '' or not email_filter.match(email): - print(u'Invalid email address. Please try again.') + print('Invalid email address. Please try again.') email = input("Email address: ") def pprompt(): @@ -60,11 +60,11 @@ def user_info_server(): p1, p2 = pprompt() while p1 != p2 or len(p1) < 6: if p1 != p2: - print(u'Passwords do not match. Please try again.') + print('Passwords do not match. Please try again.') else: print( - u'Password must be at least 6 characters. ' - u'Please try again.' + 'Password must be at least 6 characters. ' + 'Please try again.' ) p1, p2 = pprompt() diff --git a/web/pgadmin/tools/backup/__init__.py b/web/pgadmin/tools/backup/__init__.py index fd726342d..9f2b4ff07 100644 --- a/web/pgadmin/tools/backup/__init__.py +++ b/web/pgadmin/tools/backup/__init__.py @@ -248,7 +248,7 @@ def filename_with_file_manager_path(_file, create_file=True): # Set file manager directory from preference storage_dir = get_storage_directory() if storage_dir: - _file = os.path.join(storage_dir, _file.lstrip(u'/').lstrip(u'\\')) + _file = os.path.join(storage_dir, _file.lstrip('/').lstrip('\\')) elif not os.path.isabs(_file): _file = os.path.join(document_dir(), _file) diff --git a/web/pgadmin/tools/import_export/__init__.py b/web/pgadmin/tools/import_export/__init__.py index 2f2b76700..878fb1636 100644 --- a/web/pgadmin/tools/import_export/__init__.py +++ b/web/pgadmin/tools/import_export/__init__.py @@ -186,7 +186,7 @@ def filename_with_file_manager_path(_file, _present=False): storage_dir = get_storage_directory() if storage_dir: - _file = os.path.join(storage_dir, _file.lstrip(u'/').lstrip(u'\\')) + _file = os.path.join(storage_dir, _file.lstrip('/').lstrip('\\')) elif not os.path.isabs(_file): _file = os.path.join(document_dir(), _file) diff --git a/web/pgadmin/tools/restore/__init__.py b/web/pgadmin/tools/restore/__init__.py index 86ae75c4f..243f5f377 100644 --- a/web/pgadmin/tools/restore/__init__.py +++ b/web/pgadmin/tools/restore/__init__.py @@ -168,7 +168,7 @@ def filename_with_file_manager_path(_file): storage_dir = get_storage_directory() if storage_dir: - _file = os.path.join(storage_dir, _file.lstrip(u'/').lstrip(u'\\')) + _file = os.path.join(storage_dir, _file.lstrip('/').lstrip('\\')) elif not os.path.isabs(_file): _file = os.path.join(document_dir(), _file) diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py index b96b98846..014192763 100644 --- a/web/pgadmin/tools/sqleditor/__init__.py +++ b/web/pgadmin/tools/sqleditor/__init__.py @@ -223,7 +223,7 @@ def start_view_data(trans_id): status, msg = default_conn.connect() if not status: return make_json_response( - data={'status': status, 'result': u"{}".format(msg)} + data={'status': status, 'result': "{}".format(msg)} ) if status and conn is not None and \ @@ -596,8 +596,8 @@ def fetch_pg_types(columns_info, trans_obj): if oids: status, res = default_conn.execute_dict( - u"SELECT oid, format_type(oid, NULL) AS typname FROM pg_type " - u"WHERE oid IN %s ORDER BY oid;", [tuple(oids)] + "SELECT oid, format_type(oid, NULL) AS typname FROM pg_type " + "WHERE oid IN %s ORDER BY oid;", [tuple(oids)] ) if not status: @@ -701,7 +701,7 @@ def save(trans_id): is_error, errmsg, conn = _check_and_connect(trans_obj) if is_error: return make_json_response( - data={'status': status, 'result': u"{}".format(errmsg)} + data={'status': status, 'result': "{}".format(errmsg)} ) status, res, query_results, _rowid = trans_obj.save( diff --git a/web/pgadmin/utils/__init__.py b/web/pgadmin/utils/__init__.py index 2da8bd0f1..0bc946ea9 100644 --- a/web/pgadmin/utils/__init__.py +++ b/web/pgadmin/utils/__init__.py @@ -235,7 +235,7 @@ else: return _path def document_dir(): - return os.path.realpath(os.path.expanduser(u'~/')) + return os.path.realpath(os.path.expanduser('~/')) def get_complete_file_path(file): @@ -257,7 +257,7 @@ def get_complete_file_path(file): if storage_dir: file = os.path.join( storage_dir, - file.lstrip(u'/').lstrip(u'\\') + file.lstrip('/').lstrip('\\') ) if IS_WIN: file = file.replace('\\', '/') @@ -273,8 +273,8 @@ def does_utility_exist(file): """ error_msg = None if not os.path.exists(file): - error_msg = gettext(u"'%s' file not found. Please correct the Binary" - u" Path in the Preferences dialog" % file) + error_msg = gettext("'%s' file not found. Please correct the Binary" + " Path in the Preferences dialog" % file) return error_msg diff --git a/web/pgadmin/utils/driver/psycopg2/__init__.py b/web/pgadmin/utils/driver/psycopg2/__init__.py index f957c96c8..2edbd64cd 100644 --- a/web/pgadmin/utils/driver/psycopg2/__init__.py +++ b/web/pgadmin/utils/driver/psycopg2/__init__.py @@ -306,20 +306,20 @@ class Driver(BaseDriver): return True # certain types should not be quoted even though it contains a space. # Evilness. - elif for_types and value[-2:] == u"[]": + elif for_types and value[-2:] == "[]": val_noarray = value[:-2] if for_types and val_noarray.lower() in [ - u'bit varying', - u'"char"', - u'character varying', - u'double precision', - u'timestamp without time zone', - u'timestamp with time zone', - u'time without time zone', - u'time with time zone', - u'"trigger"', - u'"unknown"' + 'bit varying', + '"char"', + 'character varying', + 'double precision', + 'timestamp without time zone', + 'timestamp with time zone', + 'time without time zone', + 'time with time zone', + '"trigger"', + '"unknown"' ]: return False @@ -328,12 +328,12 @@ class Driver(BaseDriver): (val_noarray.startswith('"') or val_noarray.endswith('"')): return False - if u'0' <= val_noarray[0] <= u'9': + if '0' <= val_noarray[0] <= '9': return True for c in val_noarray: - if (not (u'a' <= c <= u'z') and c != u'_' and - not (u'0' <= c <= u'9')): + if (not ('a' <= c <= 'z') and c != '_' and + not ('0' <= c <= '9')): return True # check string is keywaord or not diff --git a/web/pgadmin/utils/driver/psycopg2/connection.py b/web/pgadmin/utils/driver/psycopg2/connection.py index 49c87084d..9e9992563 100644 --- a/web/pgadmin/utils/driver/psycopg2/connection.py +++ b/web/pgadmin/utils/driver/psycopg2/connection.py @@ -312,9 +312,9 @@ class Connection(BaseConnection): else: msg = str(e) current_app.logger.info( - u"Failed to connect to the database server(#{server_id}) for " - u"connection ({conn_id}) with error message as below" - u":{msg}".format( + "Failed to connect to the database server(#{server_id}) for " + "connection ({conn_id}) with error message as below" + ":{msg}".format( server_id=self.manager.sid, conn_id=conn_id, msg=msg @@ -407,7 +407,7 @@ class Connection(BaseConnection): return False, status if manager.role: - status = _execute(cur, u"SET ROLE TO %s", [manager.role]) + status = _execute(cur, "SET ROLE TO %s", [manager.role]) if status is not None: self.conn.close() @@ -519,7 +519,7 @@ WHERE raise ConnectionLost( self.manager.sid, self.db, - None if self.conn_id[0:3] == u'DB:' else self.conn_id[5:] + None if self.conn_id[0:3] == 'DB:' else self.conn_id[5:] ) cur = getattr(g, "{0}#{1}".format( self.manager.sid, @@ -547,7 +547,7 @@ WHERE raise ConnectionLost( self.manager.sid, self.db, - None if self.conn_id[0:3] == u'DB:' else self.conn_id[5:] + None if self.conn_id[0:3] == 'DB:' else self.conn_id[5:] ) try: @@ -588,7 +588,7 @@ WHERE raise ConnectionLost( self.manager.sid, self.db, - None if self.conn_id[0:3] == u'DB:' + None if self.conn_id[0:3] == 'DB:' else self.conn_id[5:] ) @@ -667,8 +667,8 @@ WHERE current_app.logger.log( 25, - u"Execute (with server cursor) for server #{server_id} - " - u"{conn_id} (Query-id: {query_id}):\n{query}".format( + "Execute (with server cursor) for server #{server_id} - " + "{conn_id} (Query-id: {query_id}):\n{query}".format( server_id=self.manager.sid, conn_id=self.conn_id, query=query, @@ -683,10 +683,10 @@ WHERE cur.close() errmsg = self._formatted_exception_msg(pe, formatted_exception_msg) current_app.logger.error( - u"failed to execute query ((with server cursor) " - u"for the server #{server_id} - {conn_id} " - u"(query-id: {query_id}):\n" - u"error message:{errmsg}".format( + "failed to execute query ((with server cursor) " + "for the server #{server_id} - {conn_id} " + "(query-id: {query_id}):\n" + "error message:{errmsg}".format( server_id=self.manager.sid, conn_id=self.conn_id, errmsg=errmsg, @@ -805,8 +805,8 @@ WHERE current_app.logger.log( 25, - u"Execute (scalar) for server #{server_id} - {conn_id} (Query-id: " - u"{query_id}):\n{query}".format( + "Execute (scalar) for server #{server_id} - {conn_id} (Query-id: " + "{query_id}):\n{query}".format( server_id=self.manager.sid, conn_id=self.conn_id, query=query, @@ -826,13 +826,13 @@ WHERE raise ConnectionLost( self.manager.sid, self.db, - None if self.conn_id[0:3] == u'DB:' else self.conn_id[5:] + None if self.conn_id[0:3] == 'DB:' else self.conn_id[5:] ) errmsg = self._formatted_exception_msg(pe, formatted_exception_msg) current_app.logger.error( - u"Failed to execute query (execute_scalar) for the server " - u"#{server_id} - {conn_id} (Query-id: {query_id}):\n" - u"Error Message:{errmsg}".format( + "Failed to execute query (execute_scalar) for the server " + "#{server_id} - {conn_id} (Query-id: {query_id}):\n" + "Error Message:{errmsg}".format( server_id=self.manager.sid, conn_id=self.conn_id, errmsg=errmsg, @@ -878,9 +878,9 @@ WHERE dsn = self.conn.get_dsn_parameters() current_app.logger.log( 25, - u"Execute (async) by {pga_user} on {db_user}@{db_host}/{db_name} " - u"#{server_id} - {conn_id} (Query-id: " - u"{query_id}):\n{query}".format( + "Execute (async) by {pga_user} on {db_user}@{db_host}/{db_name} " + "#{server_id} - {conn_id} (Query-id: " + "{query_id}):\n{query}".format( pga_user=current_user.username, db_user=dsn['user'], db_host=dsn['host'], @@ -901,9 +901,9 @@ WHERE except psycopg2.Error as pe: errmsg = self._formatted_exception_msg(pe, formatted_exception_msg) current_app.logger.error( - u"Failed to execute query (execute_async) for the server " - u"#{server_id} - {conn_id}(Query-id: {query_id}):\n" - u"Error Message:{errmsg}".format( + "Failed to execute query (execute_async) for the server " + "#{server_id} - {conn_id}(Query-id: {query_id}):\n" + "Error Message:{errmsg}".format( server_id=self.manager.sid, conn_id=self.conn_id, errmsg=errmsg, @@ -918,7 +918,7 @@ WHERE raise ConnectionLost( self.manager.sid, self.db, - None if self.conn_id[0:3] == u'DB:' else self.conn_id[5:] + None if self.conn_id[0:3] == 'DB:' else self.conn_id[5:] ) return False, errmsg @@ -946,8 +946,8 @@ WHERE current_app.logger.log( 25, - u"Execute (void) for server #{server_id} - {conn_id} (Query-id: " - u"{query_id}):\n{query}".format( + "Execute (void) for server #{server_id} - {conn_id} (Query-id: " + "{query_id}):\n{query}".format( server_id=self.manager.sid, conn_id=self.conn_id, query=query, @@ -968,13 +968,13 @@ WHERE raise ConnectionLost( self.manager.sid, self.db, - None if self.conn_id[0:3] == u'DB:' else self.conn_id[5:] + None if self.conn_id[0:3] == 'DB:' else self.conn_id[5:] ) errmsg = self._formatted_exception_msg(pe, formatted_exception_msg) current_app.logger.error( - u"Failed to execute query (execute_void) for the server " - u"#{server_id} - {conn_id}(Query-id: {query_id}):\n" - u"Error Message:{errmsg}".format( + "Failed to execute query (execute_void) for the server " + "#{server_id} - {conn_id}(Query-id: {query_id}):\n" + "Error Message:{errmsg}".format( server_id=self.manager.sid, conn_id=self.conn_id, errmsg=errmsg, @@ -1015,7 +1015,7 @@ WHERE raise ConnectionLost( self.manager.sid, self.db, - None if self.conn_id[0:3] == u'DB:' else self.conn_id[5:] + None if self.conn_id[0:3] == 'DB:' else self.conn_id[5:] ) def execute_2darray(self, query, params=None, @@ -1029,8 +1029,8 @@ WHERE query_id = random.randint(1, 9999999) current_app.logger.log( 25, - u"Execute (2darray) for server #{server_id} - {conn_id} " - u"(Query-id: {query_id}):\n{query}".format( + "Execute (2darray) for server #{server_id} - {conn_id} " + "(Query-id: {query_id}):\n{query}".format( server_id=self.manager.sid, conn_id=self.conn_id, query=query, @@ -1049,9 +1049,9 @@ WHERE ) errmsg = self._formatted_exception_msg(pe, formatted_exception_msg) current_app.logger.error( - u"Failed to execute query (execute_2darray) for the server " - u"#{server_id} - {conn_id} (Query-id: {query_id}):\n" - u"Error Message:{errmsg}".format( + "Failed to execute query (execute_2darray) for the server " + "#{server_id} - {conn_id} (Query-id: {query_id}):\n" + "Error Message:{errmsg}".format( server_id=self.manager.sid, conn_id=self.conn_id, errmsg=errmsg, @@ -1082,8 +1082,8 @@ WHERE query_id = random.randint(1, 9999999) current_app.logger.log( 25, - u"Execute (dict) for server #{server_id} - {conn_id} (Query-id: " - u"{query_id}):\n{query}".format( + "Execute (dict) for server #{server_id} - {conn_id} (Query-id: " + "{query_id}):\n{query}".format( server_id=self.manager.sid, conn_id=self.conn_id, query=query, @@ -1103,13 +1103,13 @@ WHERE raise ConnectionLost( self.manager.sid, self.db, - None if self.conn_id[0:3] == u'DB:' else self.conn_id[5:] + None if self.conn_id[0:3] == 'DB:' else self.conn_id[5:] ) errmsg = self._formatted_exception_msg(pe, formatted_exception_msg) current_app.logger.error( - u"Failed to execute query (execute_dict) for the server " - u"#{server_id}- {conn_id} (Query-id: {query_id}):\n" - u"Error Message:{errmsg}".format( + "Failed to execute query (execute_dict) for the server " + "#{server_id}- {conn_id} (Query-id: {query_id}):\n" + "Error Message:{errmsg}".format( server_id=self.manager.sid, conn_id=self.conn_id, query_id=query_id, @@ -1626,12 +1626,12 @@ Failed to reset the connection to the server due to following error: # Do not append if error starts with `ERROR:` as most pg related # error starts with `ERROR:` - if not errmsg.startswith(u'ERROR:'): - errmsg = gettext(u'ERROR: ') + errmsg + u'\n\n' + if not errmsg.startswith('ERROR:'): + errmsg = gettext('ERROR: ') + errmsg + '\n\n' if exception_obj.diag.severity is not None \ and exception_obj.diag.message_primary is not None: - ex_diag_message = u"{0}: {1}".format( + ex_diag_message = "{0}: {1}".format( exception_obj.diag.severity, exception_obj.diag.message_primary ) @@ -1796,16 +1796,16 @@ Failed to reset the connection to the server due to following error: ) elif psycopg2.__libpq_version__ < 100000: current_app.logger.warning( - u"To encrypt passwords the required libpq version is " - u"greater than or equal to 100000. Current libpq version " - u"is {curr_ver}".format( + "To encrypt passwords the required libpq version is " + "greater than or equal to 100000. Current libpq version " + "is {curr_ver}".format( curr_ver=psycopg2.__libpq_version__ ) ) elif not hasattr(psycopg2.extensions, 'encrypt_password'): current_app.logger.warning( - u"The psycopg2.extensions module does not have the" - u"'encrypt_password' method." + "The psycopg2.extensions module does not have the" + "'encrypt_password' method." ) return enc_password diff --git a/web/pgadmin/utils/driver/psycopg2/generate_keywords.py b/web/pgadmin/utils/driver/psycopg2/generate_keywords.py index 357cc1800..d0ceb55c5 100644 --- a/web/pgadmin/utils/driver/psycopg2/generate_keywords.py +++ b/web/pgadmin/utils/driver/psycopg2/generate_keywords.py @@ -41,8 +41,8 @@ if __name__ == '__main__': pattern = re.compile(r'"([^"]+)",\s*[^,]*\s*,\s*(.*)$') keyword_types = [ - u'UNRESERVED_KEYWORD', u'COL_NAME_KEYWORD', - u'TYPE_FUNC_NAME_KEYWORD', u'RESERVED_KEYWORD' + 'UNRESERVED_KEYWORD', 'COL_NAME_KEYWORD', + 'TYPE_FUNC_NAME_KEYWORD', 'RESERVED_KEYWORD' ] for line in ins: @@ -54,7 +54,7 @@ if __name__ == '__main__': else: keywords_file.write(" ") keywords_file.write( - '"' + match.group(1) + u'": ' + + '"' + match.group(1) + '": ' + str(keyword_types.index(match.group(2))) ) idx += 1 diff --git a/web/pgadmin/utils/driver/psycopg2/server_manager.py b/web/pgadmin/utils/driver/psycopg2/server_manager.py index ea1d9efe1..c35a3726f 100644 --- a/web/pgadmin/utils/driver/psycopg2/server_manager.py +++ b/web/pgadmin/utils/driver/psycopg2/server_manager.py @@ -185,7 +185,7 @@ class ServerManager(object): elif did in self.db_info: database = self.db_info[did]['datname'] else: - maintenance_db_id = u'DB:{0}'.format(self.db) + maintenance_db_id = 'DB:{0}'.format(self.db) if maintenance_db_id in self.connections: conn = self.connections[maintenance_db_id] # try to connect maintenance db if not connected @@ -193,7 +193,7 @@ class ServerManager(object): conn.connect() if conn.connected(): - status, res = conn.execute_dict(u""" + status, res = conn.execute_dict(""" SELECT db.oid as did, db.datname, db.datallowconn, pg_encoding_to_char(db.encoding) AS serverencoding, @@ -223,8 +223,8 @@ WHERE db.oid = {0}""".format(did)) else: raise ConnectionLost(self.sid, None, None) - my_id = (u'CONN:{0}'.format(conn_id)) if conn_id is not None else \ - (u'DB:{0}'.format(database)) + my_id = ('CONN:{0}'.format(conn_id)) if conn_id is not None else \ + ('DB:{0}'.format(database)) self.pinged = datetime.datetime.now() @@ -373,9 +373,9 @@ WHERE db.oid = {0}""".format(did)) my_id = None if conn_id is not None: - my_id = u'CONN:{0}'.format(conn_id) + my_id = 'CONN:{0}'.format(conn_id) elif database is not None: - my_id = u'DB:{0}'.format(database) + my_id = 'DB:{0}'.format(database) if my_id is not None: if my_id in self.connections: diff --git a/web/pgadmin/utils/javascript/tests/test_javascript_bundler.py b/web/pgadmin/utils/javascript/tests/test_javascript_bundler.py index 5648e9cf1..9be9b20b0 100644 --- a/web/pgadmin/utils/javascript/tests/test_javascript_bundler.py +++ b/web/pgadmin/utils/javascript/tests/test_javascript_bundler.py @@ -54,7 +54,7 @@ class JavascriptBundlerTestCase(BaseTestGenerator): self.mockSubprocessCall.return_value = 0 self.mockOs.listdir.return_value = [ - u'history.js', u'reactComponents.js'] + 'history.js', 'reactComponents.js'] javascript_bundler.bundle() self.mockSubprocessCall.assert_called_once_with( @@ -100,7 +100,7 @@ class JavascriptBundlerTestCase(BaseTestGenerator): "mock exception behavior") self.mockOs.path.exists.return_value = True self.mockOs.listdir.return_value = [ - u'history.js', u'reactComponents.js'] + 'history.js', 'reactComponents.js'] javascript_bundler.bundle() self.mockSubprocessCall.assert_called_once_with( diff --git a/web/pgadmin/utils/preferences.py b/web/pgadmin/utils/preferences.py index 5495f019c..d4858ff0b 100644 --- a/web/pgadmin/utils/preferences.py +++ b/web/pgadmin/utils/preferences.py @@ -190,7 +190,7 @@ class _Preference(object): pid=self.pid ).filter_by(uid=current_user.id).first() - value = u"{}".format(value) + value = "{}".format(value) if pref is None: pref = UserPrefTable( uid=current_user.id, pid=self.pid, value=value diff --git a/web/pgadmin/utils/sqlautocomplete/autocomplete.py b/web/pgadmin/utils/sqlautocomplete/autocomplete.py index 1031330aa..848ae8595 100644 --- a/web/pgadmin/utils/sqlautocomplete/autocomplete.py +++ b/web/pgadmin/utils/sqlautocomplete/autocomplete.py @@ -466,7 +466,7 @@ class SQLAutoComplete(object): if sort_key: if display_meta and len(display_meta) > 50: # Truncate meta-text to 50 characters, if necessary - display_meta = display_meta[:47] + u'...' + display_meta = display_meta[:47] + '...' # Lexical order of items in the collection, used for # tiebreaking items with the same match group length and start diff --git a/web/pgadmin/utils/sqlautocomplete/parseutils/ctes.py b/web/pgadmin/utils/sqlautocomplete/parseutils/ctes.py index ec8838934..3d446d6a0 100644 --- a/web/pgadmin/utils/sqlautocomplete/parseutils/ctes.py +++ b/web/pgadmin/utils/sqlautocomplete/parseutils/ctes.py @@ -87,7 +87,7 @@ def extract_ctes(sql): idx = p.token_index(tok) + 1 # Collapse everything after the ctes into a remainder query - remainder = u''.join(str(tok) for tok in p.tokens[idx:]) + remainder = ''.join(str(tok) for tok in p.tokens[idx:]) return ctes, remainder diff --git a/web/setup.py b/web/setup.py index 14bd5f9cc..9a78f1b59 100644 --- a/web/setup.py +++ b/web/setup.py @@ -362,8 +362,8 @@ def setup_db(): app = create_app() - print(u"pgAdmin 4 - Application Initialisation") - print(u"======================================\n") + print("pgAdmin 4 - Application Initialisation") + print("======================================\n") with app.app_context(): # Run migration for the first time i.e. create database -- 2.28.0 [application/octet-stream] 0007-fix-change_password-tests.patch (3.8K, 9-0007-fix-change_password-tests.patch) download | inline diff: From dcb8e1cd4bac7a3422b143b30a79b6b07978c12c Mon Sep 17 00:00:00 2001 From: Cyril Jouve <[email protected]> Date: Fri, 28 Aug 2020 22:28:23 +0200 Subject: [PATCH 7/7] fix change_password tests --- .../browser/tests/test_change_password.py | 12 ++++++------ web/pgadmin/browser/tests/utils.py | 6 ++---- web/regression/runtests.py | 18 ++++++++++++++++++ web/regression/test_config.json.in | 2 +- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/web/pgadmin/browser/tests/test_change_password.py b/web/pgadmin/browser/tests/test_change_password.py index bbc81c685..1151643c7 100644 --- a/web/pgadmin/browser/tests/test_change_password.py +++ b/web/pgadmin/browser/tests/test_change_password.py @@ -38,12 +38,12 @@ class ChangePasswordTestCase(BaseTestGenerator): # This testcase validates if confirmation password is less than # minimum length ('TestCase for Validating New_Password_Less_Than_Min_Length', - dict(password=( - config_data['pgAdmin4_login_credentials'] - ['login_password']), - new_password=str(uuid.uuid4())[4:8], - new_password_confirm=str(uuid.uuid4())[4:8], - respdata='Password must be at least 6 characters')), + [dict(password=( + config_data['pgAdmin4_login_credentials']['login_password']), + new_password=new_password, + new_password_confirm=new_password, + respdata='Password must be at least 8 characters') + for new_password in [str(uuid.uuid4())[4:8]]][0]), # This testcase validates if both password fields are left blank ('TestCase for Validating Empty_New_Password', dict( diff --git a/web/pgadmin/browser/tests/utils.py b/web/pgadmin/browser/tests/utils.py index 458ed6117..33782b755 100644 --- a/web/pgadmin/browser/tests/utils.py +++ b/web/pgadmin/browser/tests/utils.py @@ -12,9 +12,7 @@ def change_password(self): response = self.tester.get( '/browser/change_password', follow_redirects=True ) - self.assertTrue( - 'Password Change' in response.data.decode('utf-8') - ) + self.assertIn('Password Change', response.data.decode('utf-8')) csrf_token = self.tester.fetch_csrf(response) @@ -28,4 +26,4 @@ def change_password(self): ), follow_redirects=True ) - self.assertTrue(self.respdata in response.data.decode('utf-8')) + self.assertIn(self.respdata, response.data.decode('utf-8')) diff --git a/web/regression/runtests.py b/web/regression/runtests.py index 94c39cdf5..331f402dd 100644 --- a/web/regression/runtests.py +++ b/web/regression/runtests.py @@ -127,6 +127,24 @@ app.test_client_class = TestClient test_client = app.test_client() test_client.setApp(app) + +class CaptureMail: + # A hack Mail service that simply captures what would be sent. + def __init__(self, app): + app.extensions["mail"] = self + self.sent = [] + self.ascii_attachments = [] + + def send(self, msg): + self.sent.append(msg.body) + + def pop(self): + if len(self.sent): + return self.sent.pop(0) + return None + +CaptureMail(app) + setattr(unittest.result.TestResult, "passed", []) unittest.runner.TextTestResult.addSuccess = test_utils.add_success diff --git a/web/regression/test_config.json.in b/web/regression/test_config.json.in index fc1953368..690f46c1c 100644 --- a/web/regression/test_config.json.in +++ b/web/regression/test_config.json.in @@ -9,7 +9,7 @@ "pgAdmin4_test_user_credentials": { "new_password": "NEWPASSWORD", "login_password": "PASSWORD", - "login_username": "[email protected]" + "login_username": "[email protected]" }, "pgAdmin4_ldap_credentials": { "login_password": "PASSWORD", -- 2.28.0 [application/octet-stream] 0008-use-simplejson-instead-of-plain-json-compat-py3.10.patch (979B, 10-0008-use-simplejson-instead-of-plain-json-compat-py3.10.patch) download | inline diff: From 01e4e0622c71264ad0f10ce3d42420dfb7c7af82 Mon Sep 17 00:00:00 2001 From: Cyril Jouve <[email protected]> Date: Fri, 28 Aug 2020 22:52:44 +0200 Subject: [PATCH 8/8] use simplejson instead of plain json (compat py3.10) --- .../servers/databases/schemas/tables/constraints/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py index 973865611..6aa39bfdb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py @@ -9,7 +9,7 @@ """Implements Constraint Node""" -import json +import simplejson as json from flask import request from functools import wraps from pgadmin.utils.driver import get_driver -- 2.28.0 ^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: More idiomatic python3 + fix some tests 2020-08-28 20:57 More idiomatic python3 + fix some tests Cyril Jouve <[email protected]> @ 2020-08-31 11:18 ` Akshay Joshi <[email protected]> 2020-09-01 09:06 ` Re: More idiomatic python3 + fix some tests Cyril Jouve <[email protected]> 0 siblings, 1 reply; 4+ messages in thread From: Akshay Joshi @ 2020-08-31 11:18 UTC (permalink / raw) To: Cyril Jouve <[email protected]>; +Cc: pgadmin-hackers Hi Cyril Thanks, patch applied. Please make sure to run "yarn run pep8" before sending the patch. On Sat, Aug 29, 2020 at 2:28 AM Cyril Jouve <[email protected]> wrote: > Hello, > > patch 1 to 6 generated mostly using 2to3: > 0001: https://docs.python.org/3.8/library/2to3.html#2to3fixer-asserts > 0002: https://docs.python.org/3.8/library/2to3.html#2to3fixer-filter > 0003: https://docs.python.org/3.8/library/2to3.html#2to3fixer-idioms > 0004: https://docs.python.org/3.8/library/2to3.html#2to3fixer-metaclass > 0005: https://docs.python.org/3.8/library/2to3.html#2to3fixer-xrange > 0006: https://docs.python.org/3.8/library/2to3.html#2to3fixer-unicode > > patch 7 fixes change_password tests: > Less that min length : min is 8 instead of 6 > Valid password : use an user different than admin user / mock mail module > > patch 8 fixes ConstraintDeleteMultipleTestCase on py3.10 (using simplejson > like in all other modules). > > Regards, > Cyril > -- *Thanks & Regards* *Akshay Joshi* *pgAdmin Hacker | Sr. Software Architect* *EDB Postgres <http://edbpostgres.com>* *Mobile: +91 976-788-8246* ^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: More idiomatic python3 + fix some tests 2020-08-28 20:57 More idiomatic python3 + fix some tests Cyril Jouve <[email protected]> 2020-08-31 11:18 ` Re: More idiomatic python3 + fix some tests Akshay Joshi <[email protected]> @ 2020-09-01 09:06 ` Cyril Jouve <[email protected]> 2020-09-01 09:24 ` Re: More idiomatic python3 + fix some tests Murtuza Zabuawala <[email protected]> 0 siblings, 1 reply; 4+ messages in thread From: Cyril Jouve @ 2020-09-01 09:06 UTC (permalink / raw) To: Akshay Joshi <[email protected]>; +Cc: pgadmin-hackers thanks :) and sure, I'll run the linter next time! have you thought of automatic code formatters instead like yapf or black? Le lun. 31 août 2020 à 13:18, Akshay Joshi <[email protected]> a écrit : > Hi Cyril > > Thanks, patch applied. Please make sure to run "yarn run pep8" before > sending the patch. > > On Sat, Aug 29, 2020 at 2:28 AM Cyril Jouve <[email protected]> wrote: > >> Hello, >> >> patch 1 to 6 generated mostly using 2to3: >> 0001: https://docs.python.org/3.8/library/2to3.html#2to3fixer-asserts >> 0002: https://docs.python.org/3.8/library/2to3.html#2to3fixer-filter >> 0003: https://docs.python.org/3.8/library/2to3.html#2to3fixer-idioms >> 0004: https://docs.python.org/3.8/library/2to3.html#2to3fixer-metaclass >> 0005: https://docs.python.org/3.8/library/2to3.html#2to3fixer-xrange >> 0006: https://docs.python.org/3.8/library/2to3.html#2to3fixer-unicode >> >> patch 7 fixes change_password tests: >> Less that min length : min is 8 instead of 6 >> Valid password : use an user different than admin user / mock mail module >> >> patch 8 fixes ConstraintDeleteMultipleTestCase on py3.10 (using >> simplejson like in all other modules). >> >> Regards, >> Cyril >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > *pgAdmin Hacker | Sr. Software Architect* > *EDB Postgres <http://edbpostgres.com>* > > *Mobile: +91 976-788-8246* > ^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: More idiomatic python3 + fix some tests 2020-08-28 20:57 More idiomatic python3 + fix some tests Cyril Jouve <[email protected]> 2020-08-31 11:18 ` Re: More idiomatic python3 + fix some tests Akshay Joshi <[email protected]> 2020-09-01 09:06 ` Re: More idiomatic python3 + fix some tests Cyril Jouve <[email protected]> @ 2020-09-01 09:24 ` Murtuza Zabuawala <[email protected]> 0 siblings, 0 replies; 4+ messages in thread From: Murtuza Zabuawala @ 2020-09-01 09:24 UTC (permalink / raw) To: Cyril Jouve <[email protected]>; +Cc: Akshay Joshi <[email protected]>; pgadmin-hackers Hi, On Tue, Sep 1, 2020 at 2:36 PM Cyril Jouve <[email protected]> wrote: > thanks :) > > and sure, I'll run the linter next time! > > have you thought of automatic code formatters instead like yapf or black? > AFAIK, yapf is not consistent with formatting & black is non-configurable. I tried both sometime back and not found useful at that time but we can give it a shot with the new release. -- Murtuza > > > > Le lun. 31 août 2020 à 13:18, Akshay Joshi <[email protected]> > a écrit : > >> Hi Cyril >> >> Thanks, patch applied. Please make sure to run "yarn run pep8" before >> sending the patch. >> >> On Sat, Aug 29, 2020 at 2:28 AM Cyril Jouve <[email protected]> wrote: >> >>> Hello, >>> >>> patch 1 to 6 generated mostly using 2to3: >>> 0001: https://docs.python.org/3.8/library/2to3.html#2to3fixer-asserts >>> 0002: https://docs.python.org/3.8/library/2to3.html#2to3fixer-filter >>> 0003: https://docs.python.org/3.8/library/2to3.html#2to3fixer-idioms >>> 0004: https://docs.python.org/3.8/library/2to3.html#2to3fixer-metaclass >>> 0005: https://docs.python.org/3.8/library/2to3.html#2to3fixer-xrange >>> 0006: https://docs.python.org/3.8/library/2to3.html#2to3fixer-unicode >>> >>> patch 7 fixes change_password tests: >>> Less that min length : min is 8 instead of 6 >>> Valid password : use an user different than admin user / mock mail module >>> >>> patch 8 fixes ConstraintDeleteMultipleTestCase on py3.10 (using >>> simplejson like in all other modules). >>> >>> Regards, >>> Cyril >>> >> >> >> -- >> *Thanks & Regards* >> *Akshay Joshi* >> *pgAdmin Hacker | Sr. Software Architect* >> *EDB Postgres <http://edbpostgres.com>* >> >> *Mobile: +91 976-788-8246* >> > ^ permalink raw reply [nested|flat] 4+ messages in thread
end of thread, other threads:[~2020-09-01 09:24 UTC | newest] Thread overview: 4+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2020-08-28 20:57 More idiomatic python3 + fix some tests Cyril Jouve <[email protected]> 2020-08-31 11:18 ` Akshay Joshi <[email protected]> 2020-09-01 09:06 ` Cyril Jouve <[email protected]> 2020-09-01 09:24 ` Murtuza Zabuawala <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox