mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.2

Browse source
This commit is contained in:
Benjamin Peterson 2012-02-21 11:12:14 -05:00
commit d9a3591ed1
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Objects/object.c
View file

@ -763,6 +763,7 @@ _Py_HashBytes(unsigned char *p, Py_ssize_t len)
We make the hash of the empty string be 0, rather than using
(prefix ^ suffix), since this slightly obfuscates the hash secret
*/
assert(_Py_HashSecret_Initialized);
if (len == 0) {
return 0;
}

1
Objects/unicodeobject.c
View file

@ -11214,6 +11214,7 @@ unicode_hash(PyObject *self)
Py_ssize_t len;
Py_uhash_t x;
assert(_Py_HashSecret_Initialized);
if (_PyUnicode_HASH(self) != -1)
return _PyUnicode_HASH(self);
if (PyUnicode_READY(self) == -1)