(original) (raw)

changeset: 85179:9a4949f5d15c user: Christian Heimes christian@cheimes.de date: Thu Aug 15 18:31:48 2013 +0200 files: Lib/test/test_hashlib.py Misc/NEWS Modules/md5module.c Modules/sha1module.c Modules/sha256module.c Modules/sha512module.c description: Change the builtin hash algorithms' names to lower case names as promised by hashlib's documentation. diff -r 92039fb68483 -r 9a4949f5d15c Lib/test/test_hashlib.py --- a/Lib/test/test_hashlib.py Thu Aug 15 11:57:19 2013 +0200 +++ b/Lib/test/test_hashlib.py Thu Aug 15 18:31:48 2013 +0200 @@ -233,9 +233,9 @@ self.assertEqual(m.block_size, block_size) self.assertEqual(m.digest_size, digest_size) self.assertEqual(len(m.digest()), digest_size) - self.assertEqual(m.name.lower(), name.lower()) + self.assertEqual(m.name, name) # split for sha3_512 / _sha3.sha3 object - self.assertIn(name.split("_")[0], repr(m).lower()) + self.assertIn(name.split("_")[0], repr(m)) def test_blocksize_name(self): self.check_blocksize_name('md5', 64, 16) diff -r 92039fb68483 -r 9a4949f5d15c Misc/NEWS --- a/Misc/NEWS Thu Aug 15 11:57:19 2013 +0200 +++ b/Misc/NEWS Thu Aug 15 18:31:48 2013 +0200 @@ -28,6 +28,9 @@ Library ------- +- Issue #18532: Change the builtin hash algorithms' names to lower case names + as promised by hashlib's documentation. + - Issue #18405: Improve the entropy of crypt.mksalt(). - Issue #12015: The tempfile module now uses a suffix of 8 random characters diff -r 92039fb68483 -r 9a4949f5d15c Modules/md5module.c --- a/Modules/md5module.c Thu Aug 15 11:57:19 2013 +0200 +++ b/Modules/md5module.c Thu Aug 15 18:31:48 2013 +0200 @@ -439,7 +439,7 @@ static PyObject * MD5_get_name(PyObject *self, void *closure) { - return PyUnicode_FromStringAndSize("MD5", 3); + return PyUnicode_FromStringAndSize("md5", 3); } static PyObject * diff -r 92039fb68483 -r 9a4949f5d15c Modules/sha1module.c --- a/Modules/sha1module.c Thu Aug 15 11:57:19 2013 +0200 +++ b/Modules/sha1module.c Thu Aug 15 18:31:48 2013 +0200 @@ -411,7 +411,7 @@ static PyObject * SHA1_get_name(PyObject *self, void *closure) { - return PyUnicode_FromStringAndSize("SHA1", 4); + return PyUnicode_FromStringAndSize("sha1", 4); } static PyObject * diff -r 92039fb68483 -r 9a4949f5d15c Modules/sha256module.c --- a/Modules/sha256module.c Thu Aug 15 11:57:19 2013 +0200 +++ b/Modules/sha256module.c Thu Aug 15 18:31:48 2013 +0200 @@ -501,9 +501,9 @@ SHA256_get_name(PyObject *self, void *closure) { if (((SHAobject *)self)->digestsize == 32) - return PyUnicode_FromStringAndSize("SHA256", 6); + return PyUnicode_FromStringAndSize("sha256", 6); else - return PyUnicode_FromStringAndSize("SHA224", 6); + return PyUnicode_FromStringAndSize("sha224", 6); } static PyGetSetDef SHA_getseters[] = { diff -r 92039fb68483 -r 9a4949f5d15c Modules/sha512module.c --- a/Modules/sha512module.c Thu Aug 15 11:57:19 2013 +0200 +++ b/Modules/sha512module.c Thu Aug 15 18:31:48 2013 +0200 @@ -567,9 +567,9 @@ SHA512_get_name(PyObject *self, void *closure) { if (((SHAobject *)self)->digestsize == 64) - return PyUnicode_FromStringAndSize("SHA512", 6); + return PyUnicode_FromStringAndSize("sha512", 6); else - return PyUnicode_FromStringAndSize("SHA384", 6); + return PyUnicode_FromStringAndSize("sha384", 6); } static PyGetSetDef SHA_getseters[] = { /christian@cheimes.de