merge 3.2

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

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)