Skip to content

Commit 4ad3603

Browse files
[3.13] gh-137412: fix default_builtin_hashes values in test_hashlib.py (GH-137413) (#137535)
gh-137412: fix `default_builtin_hashes` values in `test_hashlib.py` (GH-137413) fix `default_builtin_hashes` in test_hashlib (cherry picked from commit deb385a) Co-authored-by: Bénédikt Tran <[email protected]>
1 parent 16cebe6 commit 4ad3603

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

Lib/test/test_hashlib.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,17 @@
2727
from http.client import HTTPException
2828

2929

30-
default_builtin_hashes = {'md5', 'sha1', 'sha256', 'sha512', 'sha3', 'blake2'}
30+
default_builtin_hashes = {'md5', 'sha1', 'sha2', 'sha3', 'blake2'}
3131
# --with-builtin-hashlib-hashes override
3232
builtin_hashes = sysconfig.get_config_var("PY_BUILTIN_HASHLIB_HASHES")
3333
if builtin_hashes is None:
3434
builtin_hashes = default_builtin_hashes
3535
else:
36-
builtin_hashes = {
37-
m.strip() for m in builtin_hashes.strip('"').lower().split(",")
38-
}
36+
builtin_hash_names = builtin_hashes.strip('"').lower().split(",")
37+
builtin_hashes = set(map(str.strip, builtin_hash_names))
3938

40-
# hashlib with and without OpenSSL backend for PBKDF2
41-
# only import builtin_hashlib when all builtin hashes are available.
42-
# Otherwise import prints noise on stderr
39+
# Public 'hashlib' module with OpenSSL backend for PBKDF2.
4340
openssl_hashlib = import_fresh_module('hashlib', fresh=['_hashlib'])
44-
if builtin_hashes == default_builtin_hashes:
45-
builtin_hashlib = import_fresh_module('hashlib', blocked=['_hashlib'])
46-
else:
47-
builtin_hashlib = None
4841

4942
try:
5043
from _hashlib import HASH, HASHXOF, openssl_md_meth_names, get_fips_mode

0 commit comments

Comments
 (0)