diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-12-21 14:17:12 -0600 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-12-21 14:17:12 -0600 |
| commit | f2b234443c53cb73dc749da57d952286437cb15a (patch) | |
| tree | f21b8b25f5bfbe76a2c85ae62f6d06060dd03372 /Lib/crypt.py | |
| parent | 26b842a82d9ae7d30c692080bf352a0ef78a626c (diff) | |
| parent | 977fd6d7c6593680fd5ffdebb262a2a3f2f24387 (diff) | |
| download | cpython-f2b234443c53cb73dc749da57d952286437cb15a.tar.gz | |
Issue #25827: Merge with 3.5
Diffstat (limited to 'Lib/crypt.py')
| -rw-r--r-- | Lib/crypt.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/crypt.py b/Lib/crypt.py index 49ab96e140..fbc5f4cc35 100644 --- a/Lib/crypt.py +++ b/Lib/crypt.py @@ -54,9 +54,8 @@ METHOD_SHA256 = _Method('SHA256', '5', 16, 63) METHOD_SHA512 = _Method('SHA512', '6', 16, 106) methods = [] -for _method in (METHOD_SHA512, METHOD_SHA256, METHOD_MD5): +for _method in (METHOD_SHA512, METHOD_SHA256, METHOD_MD5, METHOD_CRYPT): _result = crypt('', _method) if _result and len(_result) == _method.total_size: methods.append(_method) -methods.append(METHOD_CRYPT) del _result, _method |