Skip to content

Commit 7fdb092

Browse files
atombrellaatombrella
committed
·{Misc} Enable pylint:redundant-u-string-prefix
1 parent f25a321 commit 7fdb092

File tree

15 files changed

+45
-68
lines changed

15 files changed

+45
-68
lines changed

‎pylintrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ disable=
4545
use-dict-literal,
4646
consider-using-dict-items,
4747
consider-using-enumerate,
48-
redundant-u-string-prefix,
4948
raising-bad-type,
5049
unused-private-member,
5150
used-before-assignment,

‎src/azure-cli/azure/cli/command_modules/keyvault/custom.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ def get_model(x):
9696
template = CertificatePolicy(
9797
key_properties=KeyProperties(
9898
exportable=True,
99-
key_type=u'RSA',
99+
key_type='RSA',
100100
key_size=2048,
101101
reuse_key=True
102102
),
103103
secret_properties=SecretProperties(
104-
content_type=u'application/x-pkcs12'
104+
content_type='application/x-pkcs12'
105105
),
106106
x509_certificate_properties=X509CertificateProperties(
107107
key_usage=[
@@ -112,7 +112,7 @@ def get_model(x):
112112
KeyUsageType.key_agreement,
113113
KeyUsageType.key_cert_sign
114114
],
115-
subject=u'CN=CLIGetDefaultPolicy',
115+
subject='CN=CLIGetDefaultPolicy',
116116
validity_in_months=12
117117
),
118118
lifetime_actions=[LifetimeAction(
@@ -124,7 +124,7 @@ def get_model(x):
124124
)
125125
)],
126126
issuer_parameters=IssuerParameters(
127-
name=u'Self',
127+
name='Self',
128128
),
129129
attributes=CertificateAttributes(
130130
enabled=True
@@ -159,12 +159,12 @@ def get_model(x):
159159
template = CertificatePolicy(
160160
key_properties=KeyProperties(
161161
exportable=True,
162-
key_type=u'(optional) RSA or RSA-HSM (default RSA)',
162+
key_type='(optional) RSA or RSA-HSM (default RSA)',
163163
key_size=2048,
164164
reuse_key=True
165165
),
166166
secret_properties=SecretProperties(
167-
content_type=u'application/x-pkcs12 or application/x-pem-file'
167+
content_type='application/x-pkcs12 or application/x-pem-file'
168168
),
169169
x509_certificate_properties=X509CertificateProperties(
170170
key_usage=[
@@ -176,12 +176,12 @@ def get_model(x):
176176
KeyUsageType.key_cert_sign
177177
],
178178
subject_alternative_names=SubjectAlternativeNames(
179-
emails=[u'[email protected]'],
180-
dns_names=[u'hr.contoso.com', u'm.contoso.com'],
179+
emails=['[email protected]'],
180+
dns_names=['hr.contoso.com', 'm.contoso.com'],
181181
upns=[]
182182
),
183-
subject=u'C=US, ST=WA, L=Redmond, O=Contoso, OU=Contoso HR, CN=www.contoso.com',
184-
ekus=[u'1.3.6.1.5.5.7.3.1'],
183+
subject='C=US, ST=WA, L=Redmond, O=Contoso, OU=Contoso HR, CN=www.contoso.com',
184+
ekus=['1.3.6.1.5.5.7.3.1'],
185185
validity_in_months=24
186186
),
187187
lifetime_actions=[LifetimeAction(
@@ -193,8 +193,8 @@ def get_model(x):
193193
)
194194
)],
195195
issuer_parameters=IssuerParameters(
196-
name=u'Unknown, Self, or {IssuerName}',
197-
certificate_type=u'(optional) DigiCert, GlobalSign or WoSign'
196+
name='Unknown, Self, or {IssuerName}',
197+
certificate_type='(optional) DigiCert, GlobalSign or WoSign'
198198
),
199199
attributes=CertificateAttributes(
200200
enabled=True

‎src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2018_03_01/test_keyvault_commands.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -614,11 +614,11 @@ def _generate_certificate(path, keyfile=None, password=None):
614614
# Various details about who we are. For a self-signed certificate the
615615
# Subject and issuer are always the same.
616616
subject = issuer = x509.Name([
617-
x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'),
618-
x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'WA'),
619-
x509.NameAttribute(NameOID.LOCALITY_NAME, u'Redmond'),
620-
x509.NameAttribute(NameOID.ORGANIZATION_NAME, u"My Company"),
621-
x509.NameAttribute(NameOID.COMMON_NAME, u"mysite.com")])
617+
x509.NameAttribute(NameOID.COUNTRY_NAME, 'US'),
618+
x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, 'WA'),
619+
x509.NameAttribute(NameOID.LOCALITY_NAME, 'Redmond'),
620+
x509.NameAttribute(NameOID.ORGANIZATION_NAME, "My Company"),
621+
x509.NameAttribute(NameOID.COMMON_NAME, "mysite.com")])
622622

623623
cert = x509.CertificateBuilder().subject_name(subject) \
624624
.issuer_name(issuer) \

‎src/azure-cli/azure/cli/command_modules/keyvault/tests/hybrid_2020_09_01/test_keyvault_commands.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -808,11 +808,11 @@ def _generate_certificate(path, keyfile=None, password=None):
808808
# Various details about who we are. For a self-signed certificate the
809809
# Subject and issuer are always the same.
810810
subject = issuer = x509.Name([
811-
x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'),
812-
x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'WA'),
813-
x509.NameAttribute(NameOID.LOCALITY_NAME, u'Redmond'),
814-
x509.NameAttribute(NameOID.ORGANIZATION_NAME, u"My Company"),
815-
x509.NameAttribute(NameOID.COMMON_NAME, u"mysite.com")])
811+
x509.NameAttribute(NameOID.COUNTRY_NAME, 'US'),
812+
x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, 'WA'),
813+
x509.NameAttribute(NameOID.LOCALITY_NAME, 'Redmond'),
814+
x509.NameAttribute(NameOID.ORGANIZATION_NAME, "My Company"),
815+
x509.NameAttribute(NameOID.COMMON_NAME, "mysite.com")])
816816

817817
cert = x509.CertificateBuilder().subject_name(subject) \
818818
.issuer_name(issuer) \

‎src/azure-cli/azure/cli/command_modules/keyvault/tests/latest/test_keyvault_commands.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2265,11 +2265,11 @@ def _generate_certificate(path, keyfile=None, password=None):
22652265
# Various details about who we are. For a self-signed certificate the
22662266
# Subject and issuer are always the same.
22672267
subject = issuer = x509.Name([
2268-
x509.NameAttribute(NameOID.COUNTRY_NAME, u'US'),
2269-
x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u'WA'),
2270-
x509.NameAttribute(NameOID.LOCALITY_NAME, u'Redmond'),
2271-
x509.NameAttribute(NameOID.ORGANIZATION_NAME, u"My Company"),
2272-
x509.NameAttribute(NameOID.COMMON_NAME, u"mysite.com")])
2268+
x509.NameAttribute(NameOID.COUNTRY_NAME, 'US'),
2269+
x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, 'WA'),
2270+
x509.NameAttribute(NameOID.LOCALITY_NAME, 'Redmond'),
2271+
x509.NameAttribute(NameOID.ORGANIZATION_NAME, "My Company"),
2272+
x509.NameAttribute(NameOID.COMMON_NAME, "mysite.com")])
22732273

22742274
cert = x509.CertificateBuilder().subject_name(subject) \
22752275
.issuer_name(issuer) \

‎src/azure-cli/azure/cli/command_modules/keyvault/vendored_sdks/azure_keyvault_securitydomain/_serialization.py‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@
5353
List,
5454
)
5555

56-
try:
57-
from urllib import quote # type: ignore
58-
except ImportError:
59-
from urllib.parse import quote
56+
from urllib.parse import quote
6057
import xml.etree.ElementTree as ET
6158

6259
import isodate # type: ignore
@@ -931,13 +928,6 @@ def serialize_unicode(cls, data):
931928
except AttributeError:
932929
pass
933930

934-
try:
935-
if isinstance(data, unicode): # type: ignore
936-
# Don't change it, JSON and XML ElementTree are totally able
937-
# to serialize correctly u'' strings
938-
return data
939-
except NameError:
940-
return str(data)
941931
return str(data)
942932

943933
def serialize_iter(self, data, iter_type, div=None, **kwargs):

‎src/azure-cli/azure/cli/command_modules/monitor/grammar/autoscale/AutoscaleConditionLexer.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
from antlr4 import *
99
from io import StringIO
1010
import sys
11-
if sys.version_info[1] > 5:
12-
from typing import TextIO
13-
else:
14-
from typing.io import TextIO
11+
from typing import TextIO
1512

1613

1714
def serializedATN():
@@ -135,7 +132,7 @@ class AutoscaleConditionLexer(Lexer):
135132
NEWLINE = 25
136133
WORD = 26
137134

138-
channelNames = [ u"DEFAULT_TOKEN_CHANNEL", u"HIDDEN" ]
135+
channelNames = [ "DEFAULT_TOKEN_CHANNEL", "HIDDEN" ]
139136

140137
modeNames = [ "DEFAULT_MODE" ]
141138

‎src/azure-cli/azure/cli/command_modules/monitor/grammar/metric_alert/MetricAlertConditionLexer.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
from antlr4 import *
99
from io import StringIO
1010
import sys
11-
if sys.version_info[1] > 5:
12-
from typing import TextIO
13-
else:
14-
from typing.io import TextIO
11+
from typing import TextIO
1512

1613

1714
def serializedATN():
@@ -167,7 +164,7 @@ class MetricAlertConditionLexer(Lexer):
167164
NEWLINE = 29
168165
WORD = 30
169166

170-
channelNames = [ u"DEFAULT_TOKEN_CHANNEL", u"HIDDEN" ]
167+
channelNames = [ "DEFAULT_TOKEN_CHANNEL", "HIDDEN" ]
171168

172169
modeNames = [ "DEFAULT_MODE" ]
173170

‎src/azure-cli/azure/cli/command_modules/network/tests/latest/test_network_commands.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,7 @@ class NetworkAppGatewayNoWaitScenarioTest(ScenarioTest):
12401240
def test_network_app_gateway_no_wait(self, resource_group):
12411241

12421242
self.kwargs.update({
1243-
'tags': {u'a': u'b', u'c': u'd'}
1243+
'tags': {'a': 'b', 'c': 'd'}
12441244
})
12451245

12461246
self.cmd('network application-gateway create -g {rg} -n ag1 --no-wait --connection-draining-timeout 180 --priority 1001', checks=self.is_empty())

‎src/azure-cli/azure/cli/command_modules/resource/tests/hybrid_2018_03_01/test_resource.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,10 @@ def test_tag_scenario(self):
199199
self.cmd('tag add-value -n {tag} --value test')
200200
self.cmd('tag add-value -n {tag} --value test2')
201201
self.cmd('tag list --query "[?tagName == \'{tag}\']"',
202-
checks=self.check('[].values[].tagValue', [u'test', u'test2']))
202+
checks=self.check('[].values[].tagValue', ['test', 'test2']))
203203
self.cmd('tag remove-value -n {tag} --value test')
204204
self.cmd('tag list --query "[?tagName == \'{tag}\']"',
205-
checks=self.check('[].values[].tagValue', [u'test2']))
205+
checks=self.check('[].values[].tagValue', ['test2']))
206206
self.cmd('tag remove-value -n {tag} --value test2')
207207
self.cmd('tag list --query "[?tagName == \'{tag}\']"',
208208
checks=self.check('[].values[].tagValue', []))

0 commit comments

Comments
 (0)