merge 3.2

This commit is contained in:
Benjamin Peterson 2012-02-21 11:09:13 -05:00
commit e249dcab7a
5 changed files with 15 additions and 4 deletions

View file

@ -7673,6 +7673,7 @@ unicode_hash(PyUnicodeObject *self)
Py_UNICODE *p;
Py_hash_t x;
assert(_Py_HashSecret_Initialized);
if (self->hash != -1)
return self->hash;
len = Py_SIZE(self);