diff --git a/pylintrc b/pylintrc index 0961b7bb51b..269dfec4f7c 100644 --- a/pylintrc +++ b/pylintrc @@ -45,7 +45,6 @@ disable= use-dict-literal, consider-using-dict-items, consider-using-enumerate, - redundant-u-string-prefix, # These rules were added in Pylint >= 2.12, disable them to avoid making retroactive change missing-timeout, superfluous-parens, diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/custom.py b/src/azure-cli/azure/cli/command_modules/keyvault/custom.py index 4962798f126..31a19d2de40 100644 --- a/src/azure-cli/azure/cli/command_modules/keyvault/custom.py +++ b/src/azure-cli/azure/cli/command_modules/keyvault/custom.py @@ -96,12 +96,12 @@ def get_model(x): template = CertificatePolicy( key_properties=KeyProperties( exportable=True, - key_type=u'RSA', + key_type='RSA', key_size=2048, reuse_key=True ), secret_properties=SecretProperties( - content_type=u'application/x-pkcs12' + content_type='application/x-pkcs12' ), x509_certificate_properties=X509CertificateProperties( key_usage=[ @@ -112,7 +112,7 @@ def get_model(x): KeyUsageType.key_agreement, KeyUsageType.key_cert_sign ], - subject=u'CN=CLIGetDefaultPolicy', + subject='CN=CLIGetDefaultPolicy', validity_in_months=12 ), lifetime_actions=[LifetimeAction( @@ -124,7 +124,7 @@ def get_model(x): ) )], issuer_parameters=IssuerParameters( - name=u'Self', + name='Self', ), attributes=CertificateAttributes( enabled=True @@ -159,12 +159,12 @@ def get_model(x): template = CertificatePolicy( key_properties=KeyProperties( exportable=True, - key_type=u'(optional) RSA or RSA-HSM (default RSA)', + key_type='(optional) RSA or RSA-HSM (default RSA)', key_size=2048, reuse_key=True ), secret_properties=SecretProperties( - content_type=u'application/x-pkcs12 or application/x-pem-file' + content_type='application/x-pkcs12 or application/x-pem-file' ), x509_certificate_properties=X509CertificateProperties( key_usage=[ @@ -176,12 +176,12 @@ def get_model(x): KeyUsageType.key_cert_sign ], subject_alternative_names=SubjectAlternativeNames( - emails=[u'hello@contoso.com'], - dns_names=[u'hr.contoso.com', u'm.contoso.com'], + emails=['hello@contoso.com'], + dns_names=['hr.contoso.com', 'm.contoso.com'], upns=[] ), - subject=u'C=US, ST=WA, L=Redmond, O=Contoso, OU=Contoso HR, CN=www.contoso.com', - ekus=[u'1.3.6.1.5.5.7.3.1'], + subject='C=US, ST=WA, L=Redmond, O=Contoso, OU=Contoso HR, CN=www.contoso.com', + ekus=['1.3.6.1.5.5.7.3.1'], validity_in_months=24 ), lifetime_actions=[LifetimeAction( @@ -193,8 +193,8 @@ def get_model(x): ) )], issuer_parameters=IssuerParameters( - name=u'Unknown, Self, or {IssuerName}', - certificate_type=u'(optional) DigiCert, GlobalSign or WoSign' + name='Unknown, Self, or {IssuerName}', + certificate_type='(optional) DigiCert, GlobalSign or WoSign' ), attributes=CertificateAttributes( enabled=True diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2018_03_01/test_keyvault_commands.py b/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2018_03_01/test_keyvault_commands.py index 359978d80b6..23b8cb3f170 100644 --- a/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2018_03_01/test_keyvault_commands.py +++ b/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2018_03_01/test_keyvault_commands.py @@ -614,11 +614,11 @@ def _generate_certificate(path, keyfile=None, password=None): # Various details about who we are. For a self-signed certificate the # Subject and issuer are always the same. subject = issuer = x509.Name([ - x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'), - x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'WA'), - x509.NameAttribute(NameOID.LOCALITY_NAME, u'Redmond'), - x509.NameAttribute(NameOID.ORGANIZATION_NAME, u"My Company"), - x509.NameAttribute(NameOID.COMMON_NAME, u"mysite.com")]) + x509.NameAttribute(NameOID.COUNTRY_NAME, 'US'), + x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, 'WA'), + x509.NameAttribute(NameOID.LOCALITY_NAME, 'Redmond'), + x509.NameAttribute(NameOID.ORGANIZATION_NAME, "My Company"), + x509.NameAttribute(NameOID.COMMON_NAME, "mysite.com")]) cert = x509.CertificateBuilder().subject_name(subject) \ .issuer_name(issuer) \ diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2020_09_01/test_keyvault_commands.py b/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2020_09_01/test_keyvault_commands.py index c6d22ac24b9..248aab64b6b 100644 --- a/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2020_09_01/test_keyvault_commands.py +++ b/src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2020_09_01/test_keyvault_commands.py @@ -808,11 +808,11 @@ def _generate_certificate(path, keyfile=None, password=None): # Various details about who we are. For a self-signed certificate the # Subject and issuer are always the same. subject = issuer = x509.Name([ - x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'), - x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'WA'), - x509.NameAttribute(NameOID.LOCALITY_NAME, u'Redmond'), - x509.NameAttribute(NameOID.ORGANIZATION_NAME, u"My Company"), - x509.NameAttribute(NameOID.COMMON_NAME, u"mysite.com")]) + x509.NameAttribute(NameOID.COUNTRY_NAME, 'US'), + x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, 'WA'), + x509.NameAttribute(NameOID.LOCALITY_NAME, 'Redmond'), + x509.NameAttribute(NameOID.ORGANIZATION_NAME, "My Company"), + x509.NameAttribute(NameOID.COMMON_NAME, "mysite.com")]) cert = x509.CertificateBuilder().subject_name(subject) \ .issuer_name(issuer) \ diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_commands.py b/src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_commands.py index 02565833a23..f40ade0818f 100644 --- a/src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_commands.py +++ b/src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_commands.py @@ -2265,11 +2265,11 @@ def _generate_certificate(path, keyfile=None, password=None): # Various details about who we are. For a self-signed certificate the # Subject and issuer are always the same. subject = issuer = x509.Name([ - x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'), - x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'WA'), - x509.NameAttribute(NameOID.LOCALITY_NAME, u'Redmond'), - x509.NameAttribute(NameOID.ORGANIZATION_NAME, u"My Company"), - x509.NameAttribute(NameOID.COMMON_NAME, u"mysite.com")]) + x509.NameAttribute(NameOID.COUNTRY_NAME, 'US'), + x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, 'WA'), + x509.NameAttribute(NameOID.LOCALITY_NAME, 'Redmond'), + x509.NameAttribute(NameOID.ORGANIZATION_NAME, "My Company"), + x509.NameAttribute(NameOID.COMMON_NAME, "mysite.com")]) cert = x509.CertificateBuilder().subject_name(subject) \ .issuer_name(issuer) \ diff --git a/src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_securitydomain/_serialization.py b/src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_securitydomain/_serialization.py index e3cbaa81d72..7262dab2462 100644 --- a/src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_securitydomain/_serialization.py +++ b/src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_securitydomain/_serialization.py @@ -53,10 +53,7 @@ List, ) -try: - from urllib import quote # type: ignore -except ImportError: - from urllib.parse import quote +from urllib.parse import quote import xml.etree.ElementTree as ET import isodate # type: ignore @@ -931,13 +928,6 @@ def serialize_unicode(cls, data): except AttributeError: pass - try: - if isinstance(data, unicode): # type: ignore - # Don't change it, JSON and XML ElementTree are totally able - # to serialize correctly u'' strings - return data - except NameError: - return str(data) return str(data) def serialize_iter(self, data, iter_type, div=None, **kwargs): diff --git a/src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionLexer.py b/src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionLexer.py index 0aae6a1155c..10448602a5c 100644 --- a/src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionLexer.py +++ b/src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionLexer.py @@ -8,10 +8,7 @@ from antlr4 import * from io import StringIO import sys -if sys.version_info[1] > 5: - from typing import TextIO -else: - from typing.io import TextIO +from typing import TextIO def serializedATN(): @@ -135,7 +132,7 @@ class AutoscaleConditionLexer(Lexer): NEWLINE = 25 WORD = 26 - channelNames = [ u"DEFAULT_TOKEN_CHANNEL", u"HIDDEN" ] + channelNames = [ "DEFAULT_TOKEN_CHANNEL", "HIDDEN" ] modeNames = [ "DEFAULT_MODE" ] diff --git a/src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionLexer.py b/src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionLexer.py index 7f7f8ecba37..45ee78794e7 100644 --- a/src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionLexer.py +++ b/src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionLexer.py @@ -8,10 +8,7 @@ from antlr4 import * from io import StringIO import sys -if sys.version_info[1] > 5: - from typing import TextIO -else: - from typing.io import TextIO +from typing import TextIO def serializedATN(): @@ -167,7 +164,7 @@ class MetricAlertConditionLexer(Lexer): NEWLINE = 29 WORD = 30 - channelNames = [ u"DEFAULT_TOKEN_CHANNEL", u"HIDDEN" ] + channelNames = [ "DEFAULT_TOKEN_CHANNEL", "HIDDEN" ] modeNames = [ "DEFAULT_MODE" ] diff --git a/src/azure-cli/azure/cli/command_modules/network/tests/latest/test_network_commands.py b/src/azure-cli/azure/cli/command_modules/network/tests/latest/test_network_commands.py index 248dbf1f73d..c95458a71c4 100644 --- a/src/azure-cli/azure/cli/command_modules/network/tests/latest/test_network_commands.py +++ b/src/azure-cli/azure/cli/command_modules/network/tests/latest/test_network_commands.py @@ -1240,7 +1240,7 @@ class NetworkAppGatewayNoWaitScenarioTest(ScenarioTest): def test_network_app_gateway_no_wait(self, resource_group): self.kwargs.update({ - 'tags': {u'a': u'b', u'c': u'd'} + 'tags': {'a': 'b', 'c': 'd'} }) self.cmd('network application-gateway create -g {rg} -n ag1 --no-wait --connection-draining-timeout 180 --priority 1001', checks=self.is_empty()) diff --git a/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2018_03_01/test_resource.py b/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2018_03_01/test_resource.py index d28ce018f59..24f0cfb8d96 100644 --- a/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2018_03_01/test_resource.py +++ b/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2018_03_01/test_resource.py @@ -199,10 +199,10 @@ def test_tag_scenario(self): self.cmd('tag add-value -n {tag} --value test') self.cmd('tag add-value -n {tag} --value test2') self.cmd('tag list --query "[?tagName == \'{tag}\']"', - checks=self.check('[].values[].tagValue', [u'test', u'test2'])) + checks=self.check('[].values[].tagValue', ['test', 'test2'])) self.cmd('tag remove-value -n {tag} --value test') self.cmd('tag list --query "[?tagName == \'{tag}\']"', - checks=self.check('[].values[].tagValue', [u'test2'])) + checks=self.check('[].values[].tagValue', ['test2'])) self.cmd('tag remove-value -n {tag} --value test2') self.cmd('tag list --query "[?tagName == \'{tag}\']"', checks=self.check('[].values[].tagValue', [])) diff --git a/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2018_03_01/test_resource_custom.py b/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2018_03_01/test_resource_custom.py index f731783d667..74471a70ff0 100644 --- a/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2018_03_01/test_resource_custom.py +++ b/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2018_03_01/test_resource_custom.py @@ -325,8 +325,7 @@ def test_deployment_prompt_file_order(self): result_parameters = _process_parameters(template, parameter_list) missing_parameters = _find_missing_parameters(result_parameters, template) - param_file_order = ["[u'secureParam', u'boolParam', u'enumParam', u'arrayParam', u'objectParam']", - "['secureParam', 'boolParam', 'enumParam', 'arrayParam', 'objectParam']"] + param_file_order = ["['secureParam', 'boolParam', 'enumParam', 'arrayParam', 'objectParam']"] results = _prompt_for_parameters(missing_parameters, fail_on_no_tty=False) self.assertTrue(str(list(results.keys())) in param_file_order) @@ -343,8 +342,7 @@ def test_deployment_prompt_alphabetical_order(self): result_parameters = _process_parameters(template, parameter_list) missing_parameters = _find_missing_parameters(result_parameters, template) - param_alpha_order = ["[u'arrayParam', u'boolParam', u'enumParam', u'objectParam', u'secureParam']", - "['arrayParam', 'boolParam', 'enumParam', 'objectParam', 'secureParam']"] + param_alpha_order = ["['arrayParam', 'boolParam', 'enumParam', 'objectParam', 'secureParam']"] results = _prompt_for_parameters(dict(missing_parameters), fail_on_no_tty=False) self.assertTrue(str(list(results.keys())) in param_alpha_order) diff --git a/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2019_03_01/test_resource.py b/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2019_03_01/test_resource.py index 7560031aee2..869d21e3bb2 100644 --- a/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2019_03_01/test_resource.py +++ b/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2019_03_01/test_resource.py @@ -256,10 +256,10 @@ def test_tag_scenario(self): self.cmd('tag add-value -n {tag} --value test') self.cmd('tag add-value -n {tag} --value test2') self.cmd('tag list --query "[?tagName == \'{tag}\']"', - checks=self.check('[].values[].tagValue', [u'test', u'test2'])) + checks=self.check('[].values[].tagValue', ['test', 'test2'])) self.cmd('tag remove-value -n {tag} --value test') self.cmd('tag list --query "[?tagName == \'{tag}\']"', - checks=self.check('[].values[].tagValue', [u'test2'])) + checks=self.check('[].values[].tagValue', ['test2'])) self.cmd('tag remove-value -n {tag} --value test2') self.cmd('tag list --query "[?tagName == \'{tag}\']"', checks=self.check('[].values[].tagValue', [])) diff --git a/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2019_03_01/test_resource_custom.py b/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2019_03_01/test_resource_custom.py index 25b63d988af..103005071d9 100644 --- a/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2019_03_01/test_resource_custom.py +++ b/src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2019_03_01/test_resource_custom.py @@ -329,8 +329,7 @@ def test_deployment_prompt_file_order(self): result_parameters = _process_parameters(template, parameter_list) missing_parameters = _find_missing_parameters(result_parameters, template) - param_file_order = ["[u'secureParam', u'boolParam', u'enumParam', u'arrayParam', u'objectParam']", - "['secureParam', 'boolParam', 'enumParam', 'arrayParam', 'objectParam']"] + param_file_order = ["['secureParam', 'boolParam', 'enumParam', 'arrayParam', 'objectParam']"] results = _prompt_for_parameters(missing_parameters, fail_on_no_tty=False) self.assertTrue(str(list(results.keys())) in param_file_order) @@ -347,8 +346,7 @@ def test_deployment_prompt_alphabetical_order(self): result_parameters = _process_parameters(template, parameter_list) missing_parameters = _find_missing_parameters(result_parameters, template) - param_alpha_order = ["[u'arrayParam', u'boolParam', u'enumParam', u'objectParam', u'secureParam']", - "['arrayParam', 'boolParam', 'enumParam', 'objectParam', 'secureParam']"] + param_alpha_order = ["['arrayParam', 'boolParam', 'enumParam', 'objectParam', 'secureParam']"] results = _prompt_for_parameters(dict(missing_parameters), fail_on_no_tty=False) self.assertTrue(str(list(results.keys())) in param_alpha_order) diff --git a/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource.py b/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource.py index 5ab924c80f8..9d7b518172a 100644 --- a/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource.py +++ b/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource.py @@ -396,10 +396,10 @@ def test_tag_scenario(self): self.cmd('tag add-value -n {tag} --value test') self.cmd('tag add-value -n {tag} --value test2') self.cmd('tag list --query "[?tagName == \'{tag}\']"', - checks=self.check('[].values[].tagValue', [u'test', u'test2'])) + checks=self.check('[].values[].tagValue', ['test', 'test2'])) self.cmd('tag remove-value -n {tag} --value test') self.cmd('tag list --query "[?tagName == \'{tag}\']"', - checks=self.check('[].values[].tagValue', [u'test2'])) + checks=self.check('[].values[].tagValue', ['test2'])) self.cmd('tag remove-value -n {tag} --value test2') self.cmd('tag list --query "[?tagName == \'{tag}\']"', checks=self.check('[].values[].tagValue', [])) diff --git a/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_custom.py b/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_custom.py index 75ee85a758d..037482ae310 100644 --- a/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_custom.py +++ b/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_custom.py @@ -387,8 +387,7 @@ def test_deployment_prompt_file_order(self): result_parameters = _process_parameters(template, parameter_list) missing_parameters = _find_missing_parameters(result_parameters, template) - param_file_order = ["[u'secureParam', u'boolParam', u'enumParam', u'arrayParam', u'objectParam']", - "['secureParam', 'boolParam', 'enumParam', 'arrayParam', 'objectParam']"] + param_file_order = ["['secureParam', 'boolParam', 'enumParam', 'arrayParam', 'objectParam']"] results = _prompt_for_parameters(missing_parameters, fail_on_no_tty=False) self.assertTrue(str(list(results.keys())) in param_file_order) @@ -406,8 +405,7 @@ def test_deployment_prompt_alphabetical_order(self): result_parameters = _process_parameters(template, parameter_list) missing_parameters = _find_missing_parameters(result_parameters, template) - param_alpha_order = ["[u'arrayParam', u'boolParam', u'enumParam', u'objectParam', u'secureParam']", - "['arrayParam', 'boolParam', 'enumParam', 'objectParam', 'secureParam']"] + param_alpha_order = ["['arrayParam', 'boolParam', 'enumParam', 'objectParam', 'secureParam']"] results = _prompt_for_parameters(dict(missing_parameters), fail_on_no_tty=False) self.assertTrue(str(list(results.keys())) in param_alpha_order)