mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge 3.2 (#14509)

Browse source
This commit is contained in:
Benjamin Peterson 2012-04-09 15:04:39 -04:00
commit 64ed576de8
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Objects/unicodeobject.c
View file

@ -11335,7 +11335,9 @@ unicode_hash(PyObject *self)
Py_ssize_t len;
Py_uhash_t x;
#ifdef Py_DEBUG
assert(_Py_HashSecret_Initialized);
#endif
if (_PyUnicode_HASH(self) != -1)
return _PyUnicode_HASH(self);
if (PyUnicode_READY(self) == -1)