Skip to content

Commit 7d4e567

Browse files
alexalex
authored
Switch black to py36 as the minimum version (#5608)
1 parent ff12a37 commit 7d4e567

30 files changed

+988
-1066
lines changed

‎docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
base_dir = os.path.join(os.path.dirname(__file__), os.pardir)
8282
about = {}
8383
with open(os.path.join(base_dir, "src", "cryptography", "__about__.py")) as f:
84-
exec (f.read(), about)
84+
exec(f.read(), about)
8585

8686
version = release = about["__version__"]
8787

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ build-backend = "setuptools.build_meta"
1111

1212
[tool.black]
1313
line-length = 79
14-
target-version = ["py27"]
14+
target-version = ["py36"]

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
about = {}
2424
with open(os.path.join(src_dir, "cryptography", "__about__.py")) as f:
25-
exec (f.read(), about)
25+
exec(f.read(), about)
2626

2727

2828
# `setup_requirements` must be kept in sync with `pyproject.toml`

‎src/_cffi_src/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
base_src = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
1717
about = {}
1818
with open(os.path.join(base_src, "cryptography", "__about__.py")) as f:
19-
exec (f.read(), about)
19+
exec(f.read(), about)
2020

2121

2222
def build_ffi_for_binding(

‎src/cryptography/hazmat/backends/openssl/backend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ def _create_x509_extension(self, handlers, extension):
11671167
*[
11681168
encode_der(INTEGER, encode_der_integer(x.value))
11691169
for x in extension.value
1170-
]
1170+
],
11711171
)
11721172
value = _encode_asn1_str_gc(self, asn1)
11731173
return self._create_raw_x509_extension(extension, value)

‎src/cryptography/hazmat/backends/openssl/decode_asn1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def _decode_general_name(backend, gn):
132132
if "1" in bits[prefix:]:
133133
raise ValueError("Invalid netmask")
134134

135-
ip = ipaddress.ip_network(base.exploded + u"/{}".format(prefix))
135+
ip = ipaddress.ip_network(base.exploded + "/{}".format(prefix))
136136
else:
137137
ip = ipaddress.ip_address(data)
138138

‎src/cryptography/x509/extensions.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -671,9 +671,9 @@ def __init__(self, require_explicit_policy, inhibit_policy_mapping):
671671

672672
def __repr__(self):
673673
return (
674-
u"<PolicyConstraints(require_explicit_policy={0.require_explicit"
675-
u"_policy}, inhibit_policy_mapping={0.inhibit_policy_"
676-
u"mapping})>".format(self)
674+
"<PolicyConstraints(require_explicit_policy={0.require_explicit"
675+
"_policy}, inhibit_policy_mapping={0.inhibit_policy_"
676+
"mapping})>".format(self)
677677
)
678678

679679
def __eq__(self, other):
@@ -1180,8 +1180,8 @@ def _validate_ip_name(self, tree):
11801180

11811181
def __repr__(self):
11821182
return (
1183-
u"<NameConstraints(permitted_subtrees={0.permitted_subtrees}, "
1184-
u"excluded_subtrees={0.excluded_subtrees})>".format(self)
1183+
"<NameConstraints(permitted_subtrees={0.permitted_subtrees}, "
1184+
"excluded_subtrees={0.excluded_subtrees})>".format(self)
11851185
)
11861186

11871187
def __hash__(self):

‎tests/hazmat/backends/test_openssl.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@
3939

4040

4141
def skip_if_libre_ssl(openssl_version):
42-
if u"LibreSSL" in openssl_version:
42+
if "LibreSSL" in openssl_version:
4343
pytest.skip("LibreSSL hard-codes RAND_bytes to use arc4random.")
4444

4545

4646
class TestLibreSkip(object):
4747
def test_skip_no(self):
48-
assert skip_if_libre_ssl(u"OpenSSL 1.0.2h 3 May 2016") is None
48+
assert skip_if_libre_ssl("OpenSSL 1.0.2h 3 May 2016") is None
4949

5050
def test_skip_yes(self):
5151
with pytest.raises(pytest.skip.Exception):
52-
skip_if_libre_ssl(u"LibreSSL 2.1.6")
52+
skip_if_libre_ssl("LibreSSL 2.1.6")
5353

5454

5555
class DummyMGF(object):

‎tests/hazmat/primitives/test_chacha20.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ def test_invalid_nonce(self):
7171

7272
def test_invalid_key_type(self):
7373
with pytest.raises(TypeError, match="key must be bytes"):
74-
algorithms.ChaCha20(u"0" * 32, b"0" * 16)
74+
algorithms.ChaCha20("0" * 32, b"0" * 16)

‎tests/hazmat/primitives/test_ciphers.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def test_invalid_key_size(self):
4646

4747
def test_invalid_key_type(self):
4848
with pytest.raises(TypeError, match="key must be bytes"):
49-
AES(u"0" * 32)
49+
AES("0" * 32)
5050

5151

5252
class TestAESXTS(object):
@@ -94,7 +94,7 @@ def test_invalid_key_size(self):
9494

9595
def test_invalid_key_type(self):
9696
with pytest.raises(TypeError, match="key must be bytes"):
97-
Camellia(u"0" * 32)
97+
Camellia("0" * 32)
9898

9999

100100
class TestTripleDES(object):
@@ -109,7 +109,7 @@ def test_invalid_key_size(self):
109109

110110
def test_invalid_key_type(self):
111111
with pytest.raises(TypeError, match="key must be bytes"):
112-
TripleDES(u"0" * 16)
112+
TripleDES("0" * 16)
113113

114114

115115
class TestBlowfish(object):
@@ -127,7 +127,7 @@ def test_invalid_key_size(self):
127127

128128
def test_invalid_key_type(self):
129129
with pytest.raises(TypeError, match="key must be bytes"):
130-
Blowfish(u"0" * 8)
130+
Blowfish("0" * 8)
131131

132132

133133
class TestCAST5(object):
@@ -145,7 +145,7 @@ def test_invalid_key_size(self):
145145

146146
def test_invalid_key_type(self):
147147
with pytest.raises(TypeError, match="key must be bytes"):
148-
CAST5(u"0" * 10)
148+
CAST5("0" * 10)
149149

150150

151151
class TestARC4(object):
@@ -171,7 +171,7 @@ def test_invalid_key_size(self):
171171

172172
def test_invalid_key_type(self):
173173
with pytest.raises(TypeError, match="key must be bytes"):
174-
ARC4(u"0" * 10)
174+
ARC4("0" * 10)
175175

176176

177177
class TestIDEA(object):
@@ -185,7 +185,7 @@ def test_invalid_key_size(self):
185185

186186
def test_invalid_key_type(self):
187187
with pytest.raises(TypeError, match="key must be bytes"):
188-
IDEA(u"0" * 16)
188+
IDEA("0" * 16)
189189

190190

191191
class TestSEED(object):
@@ -199,7 +199,7 @@ def test_invalid_key_size(self):
199199

200200
def test_invalid_key_type(self):
201201
with pytest.raises(TypeError, match="key must be bytes"):
202-
SEED(u"0" * 16)
202+
SEED("0" * 16)
203203

204204

205205
def test_invalid_backend():

‎tests/hazmat/primitives/test_cmac.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,10 @@ def test_verify_reject_unicode(self, backend):
182182
cmac = CMAC(AES(key), backend)
183183

184184
with pytest.raises(TypeError):
185-
cmac.update(u"")
185+
cmac.update("")
186186

187187
with pytest.raises(TypeError):
188-
cmac.verify(u"")
188+
cmac.verify("")
189189

190190
@pytest.mark.supported(
191191
only_if=lambda backend: backend.cmac_algorithm_supported(

‎tests/hazmat/primitives/test_concatkdf.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,29 +100,29 @@ def test_invalid_verify(self, backend):
100100
def test_unicode_typeerror(self, backend):
101101
with pytest.raises(TypeError):
102102
ConcatKDFHash(
103-
hashes.SHA256(), 16, otherinfo=u"foo", backend=backend
103+
hashes.SHA256(), 16, otherinfo="foo", backend=backend
104104
)
105105

106106
with pytest.raises(TypeError):
107107
ckdf = ConcatKDFHash(
108108
hashes.SHA256(), 16, otherinfo=None, backend=backend
109109
)
110110

111-
ckdf.derive(u"foo")
111+
ckdf.derive("foo")
112112

113113
with pytest.raises(TypeError):
114114
ckdf = ConcatKDFHash(
115115
hashes.SHA256(), 16, otherinfo=None, backend=backend
116116
)
117117

118-
ckdf.verify(u"foo", b"bar")
118+
ckdf.verify("foo", b"bar")
119119

120120
with pytest.raises(TypeError):
121121
ckdf = ConcatKDFHash(
122122
hashes.SHA256(), 16, otherinfo=None, backend=backend
123123
)
124124

125-
ckdf.verify(b"foo", u"bar")
125+
ckdf.verify(b"foo", "bar")
126126

127127

128128
@pytest.mark.requires_backend_interface(interface=HMACBackend)
@@ -249,7 +249,7 @@ def test_unicode_typeerror(self, backend):
249249
ConcatKDFHMAC(
250250
hashes.SHA256(),
251251
16,
252-
salt=u"foo",
252+
salt="foo",
253253
otherinfo=None,
254254
backend=backend,
255255
)
@@ -259,7 +259,7 @@ def test_unicode_typeerror(self, backend):
259259
hashes.SHA256(),
260260
16,
261261
salt=None,
262-
otherinfo=u"foo",
262+
otherinfo="foo",
263263
backend=backend,
264264
)
265265

@@ -268,21 +268,21 @@ def test_unicode_typeerror(self, backend):
268268
hashes.SHA256(), 16, salt=None, otherinfo=None, backend=backend
269269
)
270270

271-
ckdf.derive(u"foo")
271+
ckdf.derive("foo")
272272

273273
with pytest.raises(TypeError):
274274
ckdf = ConcatKDFHMAC(
275275
hashes.SHA256(), 16, salt=None, otherinfo=None, backend=backend
276276
)
277277

278-
ckdf.verify(u"foo", b"bar")
278+
ckdf.verify("foo", b"bar")
279279

280280
with pytest.raises(TypeError):
281281
ckdf = ConcatKDFHMAC(
282282
hashes.SHA256(), 16, salt=None, otherinfo=None, backend=backend
283283
)
284284

285-
ckdf.verify(b"foo", u"bar")
285+
ckdf.verify(b"foo", "bar")
286286

287287

288288
def test_invalid_backend():

‎tests/hazmat/primitives/test_constant_time.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
class TestConstantTimeBytesEq(object):
1313
def test_reject_unicode(self):
1414
with pytest.raises(TypeError):
15-
constant_time.bytes_eq(b"foo", u"foo")
15+
constant_time.bytes_eq(b"foo", "foo")
1616

1717
with pytest.raises(TypeError):
18-
constant_time.bytes_eq(u"foo", b"foo")
18+
constant_time.bytes_eq("foo", b"foo")
1919

2020
with pytest.raises(TypeError):
21-
constant_time.bytes_eq(u"foo", u"foo")
21+
constant_time.bytes_eq("foo", "foo")
2222

2323
def test_compares(self):
2424
assert constant_time.bytes_eq(b"foo", b"foo") is True

‎tests/hazmat/primitives/test_hashes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class TestHashContext(object):
2222
def test_hash_reject_unicode(self, backend):
2323
m = hashes.Hash(hashes.SHA1(), backend=backend)
2424
with pytest.raises(TypeError):
25-
m.update(u"\u00FC")
25+
m.update("\u00FC")
2626

2727
def test_hash_algorithm_instance(self, backend):
2828
with pytest.raises(TypeError):

‎tests/hazmat/primitives/test_hkdf.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,31 +65,31 @@ def test_verify_invalid(self, backend):
6565

6666
def test_unicode_typeerror(self, backend):
6767
with pytest.raises(TypeError):
68-
HKDF(hashes.SHA256(), 16, salt=u"foo", info=None, backend=backend)
68+
HKDF(hashes.SHA256(), 16, salt="foo", info=None, backend=backend)
6969

7070
with pytest.raises(TypeError):
71-
HKDF(hashes.SHA256(), 16, salt=None, info=u"foo", backend=backend)
71+
HKDF(hashes.SHA256(), 16, salt=None, info="foo", backend=backend)
7272

7373
with pytest.raises(TypeError):
7474
hkdf = HKDF(
7575
hashes.SHA256(), 16, salt=None, info=None, backend=backend
7676
)
7777

78-
hkdf.derive(u"foo")
78+
hkdf.derive("foo")
7979

8080
with pytest.raises(TypeError):
8181
hkdf = HKDF(
8282
hashes.SHA256(), 16, salt=None, info=None, backend=backend
8383
)
8484

85-
hkdf.verify(u"foo", b"bar")
85+
hkdf.verify("foo", b"bar")
8686

8787
with pytest.raises(TypeError):
8888
hkdf = HKDF(
8989
hashes.SHA256(), 16, salt=None, info=None, backend=backend
9090
)
9191

92-
hkdf.verify(b"foo", u"bar")
92+
hkdf.verify(b"foo", "bar")
9393

9494
def test_derive_short_output(self, backend):
9595
hkdf = HKDF(hashes.SHA256(), 4, salt=None, info=None, backend=backend)
@@ -202,7 +202,7 @@ def test_unicode_error(self, backend):
202202
hkdf = HKDFExpand(hashes.SHA256(), 42, info, backend)
203203

204204
with pytest.raises(TypeError):
205-
hkdf.derive(u"first")
205+
hkdf.derive("first")
206206

207207

208208
def test_invalid_backend():

‎tests/hazmat/primitives/test_hmac.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class TestHMAC(object):
3737
def test_hmac_reject_unicode(self, backend):
3838
h = hmac.HMAC(b"mykey", hashes.SHA1(), backend=backend)
3939
with pytest.raises(TypeError):
40-
h.update(u"\u00FC")
40+
h.update("\u00FC")
4141

4242
def test_hmac_algorithm_instance(self, backend):
4343
with pytest.raises(TypeError):
@@ -77,7 +77,7 @@ def test_invalid_verify(self, backend):
7777
def test_verify_reject_unicode(self, backend):
7878
h = hmac.HMAC(b"", hashes.SHA1(), backend=backend)
7979
with pytest.raises(TypeError):
80-
h.verify(u"")
80+
h.verify("")
8181

8282
def test_unsupported_hash(self, backend):
8383
with raises_unsupported_algorithm(_Reasons.UNSUPPORTED_HASH):

‎tests/hazmat/primitives/test_kbkdf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def test_unicode_error_label(self, backend):
283283
4,
284284
4,
285285
CounterLocation.BeforeFixed,
286-
u"label",
286+
"label",
287287
b"context",
288288
backend=backend,
289289
)
@@ -298,7 +298,7 @@ def test_unicode_error_context(self, backend):
298298
4,
299299
CounterLocation.BeforeFixed,
300300
b"label",
301-
u"context",
301+
"context",
302302
None,
303303
backend=backend,
304304
)
@@ -317,7 +317,7 @@ def test_unicode_error_key_material(self, backend):
317317
None,
318318
backend=backend,
319319
)
320-
kdf.derive(u"material")
320+
kdf.derive("material")
321321

322322
def test_buffer_protocol(self, backend):
323323
kdf = KBKDFHMAC(

0 commit comments

Comments
 (0)