From 31a929388b3adb153a3b09be284dce3869bb39fe Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Wed, 15 Apr 2020 15:30:33 +0530 Subject: [PATCH] Make changes to use gettext() function correctly. --- web/pgadmin/__init__.py | 10 ++++------ web/pgadmin/browser/server_groups/servers/__init__.py | 8 +++++--- .../server_groups/servers/databases/__init__.py | 3 ++- .../server_groups/servers/databases/casts/__init__.py | 3 ++- .../servers/databases/event_triggers/__init__.py | 5 +++-- .../servers/databases/extensions/__init__.py | 3 ++- .../servers/databases/external_tables/properties.py | 6 +++--- .../databases/foreign_data_wrappers/__init__.py | 3 ++- .../foreign_data_wrappers/foreign_servers/__init__.py | 3 ++- .../foreign_servers/user_mappings/__init__.py | 3 ++- .../servers/databases/languages/__init__.py | 3 ++- .../servers/databases/schemas/__init__.py | 4 ++-- .../servers/databases/schemas/collations/__init__.py | 3 ++- .../databases/schemas/fts_configurations/__init__.py | 3 ++- .../servers/databases/schemas/fts_parsers/__init__.py | 3 ++- .../databases/schemas/fts_templates/__init__.py | 3 ++- .../servers/databases/schemas/packages/__init__.py | 3 ++- .../servers/databases/schemas/synonyms/__init__.py | 3 ++- .../servers/databases/schemas/tables/__init__.py | 5 +++-- .../databases/schemas/tables/columns/__init__.py | 4 ++-- .../schemas/tables/compound_triggers/__init__.py | 4 ++-- .../tables/constraints/check_constraint/__init__.py | 3 ++- .../constraints/exclusion_constraint/__init__.py | 6 ++++-- .../schemas/tables/constraints/foreign_key/__init__.py | 6 ++++-- .../tables/constraints/index_constraint/__init__.py | 5 +++-- .../databases/schemas/tables/indexes/__init__.py | 4 ++-- .../servers/databases/schemas/types/__init__.py | 4 ++-- .../servers/databases/schemas/views/__init__.py | 5 +++-- .../browser/server_groups/servers/pgagent/__init__.py | 3 ++- .../server_groups/servers/resource_groups/__init__.py | 3 ++- .../server_groups/servers/tablespaces/__init__.py | 4 ++-- 31 files changed, 76 insertions(+), 52 deletions(-) diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py index ef6461ee4..a1b19fb7e 100644 --- a/web/pgadmin/__init__.py +++ b/web/pgadmin/__init__.py @@ -503,7 +503,7 @@ def create_app(app_name=None): svr_discovery_id = inst_id svr_comment = gettext( "Auto-detected %s installation with the data " - "directory at %s") % ( + "directory at {}").format( winreg.QueryValueEx( inst_key, 'Display Name' )[0], @@ -557,11 +557,9 @@ def create_app(app_name=None): if hasattr(str, 'decode'): description = description.decode('utf-8') data_directory = data_directory.decode('utf-8') - svr_comment = gettext(u"Auto-detected %s installation " - u"with the data directory at %s") % ( - description, - data_directory - ) + svr_comment = gettext(u"Auto-detected {0} installation " + u"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, svr_comment) diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py index d62d69138..9266cdbcf 100644 --- a/web/pgadmin/browser/server_groups/servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/__init__.py @@ -737,7 +737,8 @@ class ServerNode(PGChildNodeView): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) if 'hostaddr' in data and data['hostaddr'] and data['hostaddr'] != '': @@ -835,7 +836,8 @@ class ServerNode(PGChildNodeView): status=401, success=0, errormsg=gettext( - u"Unable to connect to server:\n\n%s") % errmsg + u"Unable to connect to server:\n\n{}" + ).format(errmsg) ) else: if 'save_password' in data and data['save_password'] and \ @@ -1027,7 +1029,7 @@ class ServerNode(PGChildNodeView): tunnel_password = server.tunnel_password else: tunnel_password = data['tunnel_password'] \ - if 'tunnel_password'in data else '' + if 'tunnel_password' in data else '' save_tunnel_password = data['save_tunnel_password'] \ if tunnel_password and 'save_tunnel_password' in data \ else False diff --git a/web/pgadmin/browser/server_groups/servers/databases/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/__init__.py index 085ee35b6..0d1581f5f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/__init__.py @@ -567,7 +567,8 @@ class DatabaseView(PGChildNodeView): status=410, success=0, errormsg=_( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) # The below SQL will execute CREATE DDL only SQL = render_template( 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 503192cb2..6f2ece0f9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py @@ -368,7 +368,8 @@ class CastView(PGChildNodeView): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) try: sql = render_template("/".join([self.template_path, 'create.sql']), 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 42da4cfc4..aa35fb5d4 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 @@ -378,7 +378,7 @@ class EventTriggerView(PGChildNodeView): status=400, success=0, errormsg=gettext( - "Could not find the required parameter %s.") % err + "Could not find the required parameter {}.".format(err)) ) try: sql = render_template( @@ -636,7 +636,8 @@ class EventTriggerView(PGChildNodeView): status=410, success=0, errormsg=gettext( - "Could not find the required parameter %s.") % err + "Could not find the required parameter {}." + ).format(arg) ) sql = render_template( "/".join([self.template_path, 'create.sql']), diff --git a/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py index 9605b9b4a..21b314083 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py @@ -262,7 +262,8 @@ class ExtensionView(PGChildNodeView): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) status, res = self.conn.execute_dict( diff --git a/web/pgadmin/browser/server_groups/servers/databases/external_tables/properties.py b/web/pgadmin/browser/server_groups/servers/databases/external_tables/properties.py index da1b2c5fc..5d0107fce 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/external_tables/properties.py +++ b/web/pgadmin/browser/server_groups/servers/databases/external_tables/properties.py @@ -65,7 +65,7 @@ class Properties: @staticmethod def translate_execute_on_text(execute_on): if execute_on['type'] == 'host': - return gettext('host %s') % execute_on['value'] + return gettext('host {}').format(execute_on['value']) elif execute_on['type'] == 'per_host': return gettext('per host') elif execute_on['type'] == 'master_only': @@ -73,6 +73,6 @@ class Properties: elif execute_on['type'] == 'all_segments': return gettext('all segments') elif execute_on['type'] == 'segment': - return gettext('%s segment') % execute_on['value'] + return gettext('{} segment').format(execute_on['value']) elif execute_on['type'] == 'segments': - return gettext('%d segments') % execute_on['value'] + return gettext('{} segments').format(execute_on['value']) 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 e5bf06357..371e21313 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 @@ -393,7 +393,8 @@ class ForeignDataWrapperView(PGChildNodeView): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) try: 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 66fcf424b..6286ed94e 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 @@ -388,7 +388,8 @@ class ForeignServerView(PGChildNodeView): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) try: if 'fsrvacl' in data: 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 47e55570a..61743eb65 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 @@ -396,7 +396,8 @@ class UserMappingView(PGChildNodeView): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) try: diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py index 77f22e6fa..ecd6e3cc1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py @@ -453,7 +453,8 @@ class LanguageView(PGChildNodeView): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) try: 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 38cdec02c..a13402fff 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py @@ -570,8 +570,8 @@ It may have been removed by another user. status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % - required_args[arg] + "Could not find the required parameter ({})." + ).format(arg) ) try: self.format_request_acls(data) 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 8cf703987..8c0537bf0 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 @@ -458,7 +458,8 @@ class CollationView(PGChildNodeView, SchemaDiffObjectCompare): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) if self._check_definition(data): return make_json_response( 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 362f7c6ce..d17f511ca 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 @@ -422,7 +422,8 @@ class FtsConfigurationView(PGChildNodeView, SchemaDiffObjectCompare): status=410, success=0, errormsg=_( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) # Either copy config or parser must be present in data diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py index b79b6ef5b..ce5d82aed 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py @@ -379,7 +379,8 @@ class FtsParserView(PGChildNodeView, SchemaDiffObjectCompare): status=410, success=0, errormsg=_( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) # Fetch schema name from schema oid sql = render_template( 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 4d61e8dcb..1e760b637 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 @@ -354,7 +354,8 @@ class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) # Fetch schema name from schema oid sql = render_template("/".join([self.template_path, 'schema.sql']), 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 519e30e97..56d33c06c 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 @@ -379,7 +379,8 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare): status=400, success=0, errormsg=_( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) data['schema'] = self.schema diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py index 13623b737..8c53c2b51 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py @@ -450,7 +450,8 @@ class SynonymView(PGChildNodeView, SchemaDiffObjectCompare): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) try: 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 bea7b33f4..03073e277 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 @@ -908,7 +908,8 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings, status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) # Parse privilege data coming from client according to database format @@ -1577,7 +1578,7 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings, return make_json_response( status=200, - info=gettext("Table rows counted: %s") % count, + info=gettext("Table rows counted: {}").format(count), data={'total_rows': count} ) 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 280958a98..ef0ddd3ae 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 @@ -392,8 +392,8 @@ class ColumnsView(PGChildNodeView, DataTypeReader): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % - required_args[arg] + "Could not find the required parameter ({})." + ).format(required_args[arg]) ) # Parse privilege data coming from client according to database format diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py index 553d06c31..c80c752ca 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py @@ -511,8 +511,8 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % - required_args[arg] + "Could not find the required parameter ({})." + ).format(required_args[arg]) ) # Adding parent into data dict, will be using it while creating sql 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 2f1ba57bb..9f263fb47 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 @@ -476,7 +476,8 @@ class CheckConstraintView(PGChildNodeView): status=400, success=0, errormsg=_( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) data['schema'] = self.schema 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 ab3ee6ab5..c5e6b9959 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 @@ -496,14 +496,16 @@ class ExclusionConstraintView(PGChildNodeView): status=400, success=0, errormsg=_( - "Could not find required parameter (%s).") % str(arg) + "Could not find required parameter ({})." + ).format(arg) ) elif isinstance(data[arg], list) and len(data[arg]) < 1: return make_json_response( status=400, success=0, errormsg=_( - "Could not find required parameter (%s).") % str(arg) + "Could not find required parameter ({})." + ).format(arg) ) data['schema'] = self.schema 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 d057a3f2f..81eeb067d 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 @@ -514,14 +514,16 @@ class ForeignKeyConstraintView(PGChildNodeView): status=400, success=0, errormsg=_( - "Could not find required parameter (%s).") % str(arg) + "Could not find required parameter ({})." + ).format(arg) ) elif isinstance(data[arg], list) and len(data[arg]) < 1: return make_json_response( status=400, success=0, errormsg=_( - "Could not find required parameter (%s).") % str(arg) + "Could not find required parameter ({})." + ).format(arg) ) data['schema'] = self.schema 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 05c5f84d1..444ed0b2b 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 @@ -535,7 +535,7 @@ class IndexConstraintView(PGChildNodeView): success=0, errormsg=_( "Could not find at least one required " - "parameter (%s).") % str(param) + "parameter ({}).".format(str(param))) ) elif arg not in data: @@ -543,7 +543,8 @@ class IndexConstraintView(PGChildNodeView): status=400, success=0, errormsg=_( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) data['schema'] = self.schema diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py index c68804520..801f8297a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py @@ -580,8 +580,8 @@ class IndexesView(PGChildNodeView, SchemaDiffObjectCompare): "create index.") if arg not in data: - err_msg = gettext("Could not find the required parameter (%s)" - ".") % required_args[arg] + err_msg = gettext("Could not find the required parameter ({})" + ".").format(required_args[arg]) # Check if we have at least one column if err_msg is not None: return make_json_response( 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 02eb23b02..4a8e91c55 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 @@ -946,8 +946,8 @@ class TypeView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % - required_args[arg] + "Could not find the required parameter ({})." + ).format(arg) ) # Additional checks goes here # If type is range then check if subtype is defined or not 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 955af8bc1..a8da96e12 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 @@ -493,7 +493,8 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) try: SQL, nameOrError = self.getSQL(gid, sid, did, data) @@ -743,7 +744,7 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare): ).split('FROM') if 'definition' in data and ( len(old_def) > 1 or len(new_def) > 1 - ) and( + ) and ( old_def[0] != new_def[0] and old_def[0] not in new_def[0] ): diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py b/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py index 28a8e5901..797a6cb81 100644 --- a/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/pgagent/__init__.py @@ -284,7 +284,8 @@ SELECT EXISTS( status=410, success=0, errormsg=_( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) status, res = self.conn.execute_void('BEGIN') diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py b/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py index 24d3206ad..913dad50c 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py @@ -363,7 +363,8 @@ class ResourceGroupView(NodeView): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter ({})." + ).format(arg) ) try: # Below logic will create new resource group diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py index 73e81e1b1..8e2f7f8a9 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py @@ -295,8 +295,8 @@ class TablespaceView(PGChildNodeView): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") % - required_args[arg] + "Could not find the required parameter ({})." + ).format(arg) ) # To format privileges coming from client