Skip to content

Commit 978b94c

Browse files
authored
{Pylint} Fix implicit-str-concat (#30363)
1 parent 8c34108 commit 978b94c

File tree

11 files changed

+19
-20
lines changed

11 files changed

+19
-20
lines changed

pylintrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ disable=
4646
# These rules were added in Pylint >= 2.12, disable them to avoid making retroactive change
4747
missing-timeout,
4848
superfluous-parens,
49-
implicit-str-concat,
5049
unnecessary-dunder-call,
5150
# These rules were added in Pylint >= 3.2
5251
possibly-used-before-assignment,

src/azure-cli/azure/cli/command_modules/acs/_roleassignments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ def ensure_cluster_identity_permission_on_kubelet_identity(cmd, cluster_identity
301301
if use_shared_identity():
302302
return
303303
raise UnauthorizedError(
304-
"Could not grant Managed Identity Operator " "permission to cluster identity at scope {}".format(scope)
304+
"Could not grant Managed Identity Operator permission to cluster identity at scope {}".format(scope)
305305
)
306306

307307

src/azure-cli/azure/cli/command_modules/appservice/_params.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ def load_arguments(self, _):
438438
c.argument('dapr_enable_api_logging', options_list=['--dapr-enable-api-logging', '--dal'], help="Enable/Disable API logging for the Dapr sidecar.", arg_type=get_three_state_flag(return_label=True))
439439
c.argument('workload_profile_name', help="The name of the workload profile to run the app on.", is_preview=True)
440440
c.argument('cpu', type=float, help="Required CPU in cores from 0.5 to 2.0.", is_preview=True)
441-
c.argument('memory', help="Required momory from 1.0 to 4.0 ending with ""Gi"" e.g. 1.0Gi, ", is_preview=True)
441+
c.argument('memory', help="Required momory from 1.0 to 4.0 ending with Gi e.g. 1.0Gi, ", is_preview=True)
442442

443443
with self.argument_context('functionapp runtime config') as c:
444444
c.argument('runtime_version', help='The version of the functions runtime stack. Use "az functionapp list-flexconsumption-runtimes" to check supported runtimes and versions', is_preview=True)

src/azure-cli/azure/cli/command_modules/billing/manual/_params.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def load_arguments(self, _):
6565
"invoice_name",
6666
options_list=["--name", "-n", "--invoice-name"],
6767
type=str,
68-
help="The ID that " "uniquely identifies an invoice.",
68+
help="The ID that uniquely identifies an invoice.",
6969
)
7070
c.argument(
7171
"by_subscription",
@@ -129,7 +129,7 @@ def load_arguments(self, _):
129129
"name",
130130
options_list=["--name", "-n"],
131131
type=str,
132-
help="The ID that uniquely identifies a role " "assignment.",
132+
help="The ID that uniquely identifies a role assignment.",
133133
)
134134
c.argument(
135135
"profile_name",

src/azure-cli/azure/cli/command_modules/cdn/custom/custom_rule_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ def create_action(action_name, cache_behavior=None, cache_duration=None, header_
292292
action = {
293293
"cache_key_query_string": {
294294
"parameters": {
295-
"type_name" "DeliveryRuleCacheKeyQueryStringBehaviorActionParameters"
295+
"type_name": "DeliveryRuleCacheKeyQueryStringBehaviorActionParameters",
296296
"query_string_behavior": query_string_behavior,
297297
"query_parameters": query_parameters
298298
}

src/azure-cli/azure/cli/command_modules/policyinsights/_params.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ def load_arguments(self, _):
4242
'namespace',
4343
completer=get_providers_completion_list,
4444
arg_group='Resource ID',
45-
help='Provider namespace (Ex: ''Microsoft.Provider'').')
45+
help='Provider namespace (Ex: Microsoft.Provider).')
4646
c.argument(
4747
'resource_type_parent',
4848
options_list=['--parent'],
4949
arg_group='Resource ID',
50-
help='The parent path (Ex: ''resourceTypeA/nameA/resourceTypeB/nameB'').')
50+
help='The parent path (Ex: resourceTypeA/nameA/resourceTypeB/nameB).')
5151
c.argument(
5252
'resource_type',
5353
completer=get_resource_types_completion_list,
5454
arg_group='Resource ID',
55-
help='Resource type (Ex: ''resourceTypeC'').')
55+
help='Resource type (Ex: resourceTypeC).')
5656

5757
for scope in ['state', 'event']:
5858
with self.argument_context('policy {}'.format(scope)) as c:
@@ -137,7 +137,7 @@ def load_arguments(self, _):
137137
'location_filters',
138138
options_list='--location-filters',
139139
nargs='+',
140-
help='Space separated list of resource locations that should be remediated (Ex: ''centralus westeurope'').') # pylint: disable=line-too-long
140+
help='Space separated list of resource locations that should be remediated (Ex: centralus westeurope).') # pylint: disable=line-too-long
141141
c.argument(
142142
'policy_assignment',
143143
options_list=['--policy-assignment', '-a'],

src/azure-cli/azure/cli/command_modules/relay/tests/latest/test_relay_commands.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def test_relay_hyco(self, resource_group):
102102
'loc': 'westus2',
103103
'rg': resource_group,
104104
'namespacename': self.create_random_name(prefix='relay-nscli', length=20),
105-
'tags': 'tag1=value1' 'tag2=value2',
105+
'tags': 'tag1=value1 tag2=value2',
106106
'authoname': self.create_random_name(prefix='cliAutho', length=20),
107107
'defaultauthorizationrule': 'RootManageSharedAccessKey',
108108
'accessrights': 'Listen',
@@ -185,7 +185,7 @@ def test_relay_wcfrelay(self, resource_group):
185185
'rg': resource_group,
186186
'relaytype': 'Http',
187187
'namespacename': self.create_random_name(prefix='relay-nscli', length=20),
188-
'tags': 'tag1=value1' 'tag2=value2',
188+
'tags': 'tag1=value1 tag2=value2',
189189
'authoname': self.create_random_name(prefix='cliAutho', length=20),
190190
'defaultauthorizationrule': 'RootManageSharedAccessKey',
191191
'accessrights': 'Send',

src/azure-cli/azure/cli/command_modules/search/custom.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def pre_operations(self):
4848

4949
if args.hosting_mode == "highDensity" and args.sku != "standard3":
5050
raise UnrecognizedArgumentError(
51-
"SearchService.HostingMode: ""highDensity"" is only allowed when sku is ""standard3""")
51+
"SearchService.HostingMode: highDensity is only allowed when sku is standard3")
5252

5353
if has_value(args.ip_rules):
5454
ip_rules = re.split(';|,', args.ip_rules.to_serialized_data())
@@ -173,7 +173,7 @@ def update_search_service(instance, partition_count=0, replica_count=0, public_n
173173
if public_network_access:
174174
if (public_network_access.lower() not in ["enabled", "disabled"]):
175175
raise UnrecognizedArgumentError(
176-
"SearchService.PublicNetworkAccess: only [""enabled"", ""disabled""] are allowed")
176+
"SearchService.PublicNetworkAccess: only [enabled, disabled] are allowed")
177177
instance.public_network_access = public_network_access
178178
if ip_rules:
179179
_ip_rules = []
@@ -318,12 +318,12 @@ def setup_search_auth(instance, disable_local_auth, auth_options, aad_auth_failu
318318
# Done by argument define
319319
if (auth_options is not None and auth_options not in ["aadOrApiKey", "apiKeyOnly"]):
320320
raise UnrecognizedArgumentError(
321-
"SearchService.AuthOptions: only [""aadOrApiKey"", ""apiKeyOnly""] are allowed")
321+
"SearchService.AuthOptions: only [aadOrApiKey, apiKeyOnly] are allowed")
322322
# Done in aaz by default
323323
if (aad_auth_failure_mode is not None and aad_auth_failure_mode not in ["http401WithBearerChallenge", "http403"]):
324324
raise UnrecognizedArgumentError(
325325
"SearchService.AuthOptions.AadAuthFailureMode: only "
326-
"[""http401WithBearerChallenge"", ""http403""] are allowed")
326+
"[http401WithBearerChallenge, http403] are allowed")
327327

328328
# Done in pre_operations
329329
if disable_local_auth and auth_options:

src/azure-cli/azure/cli/command_modules/sql/custom.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ def _find_edition_capability(sku, supported_editions):
281281
return next(e for e in supported_editions if e.name == sku.tier)
282282
except StopIteration:
283283
candidate_editions = [e.name for e in supported_editions]
284-
raise CLIError('Could not find tier ''{}''. Supported tiers are: {}'.format(
284+
raise CLIError('Could not find tier {}. Supported tiers are: {}'.format(
285285
sku.tier, candidate_editions
286286
))
287287
else:
@@ -304,7 +304,7 @@ def _find_family_capability(sku, supported_families):
304304
return next(f for f in supported_families if f.name == sku.family)
305305
except StopIteration:
306306
candidate_families = [e.name for e in supported_families]
307-
raise CLIError('Could not find family ''{}''. Supported families are: {}'.format(
307+
raise CLIError('Could not find family {}. Supported families are: {}'.format(
308308
sku.family, candidate_families
309309
))
310310
else:

src/azure-cli/azure/cli/command_modules/storage/commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.DAT
392392
g.storage_custom_command_oauth('generate-sas', 'generate_sas_blob_uri')
393393

394394
blob_service_sdk = CliCommandType(
395-
operations_tmpl='azure.multiapi.storagev2.blob._blob_service_client#' 'BlobServiceClient.{}',
395+
operations_tmpl='azure.multiapi.storagev2.blob._blob_service_client#BlobServiceClient.{}',
396396
client_factory=cf_blob_service,
397397
resource_type=ResourceType.DATA_STORAGE_BLOB
398398
)

0 commit comments

Comments
 (0)