merge 2.6

This commit is contained in:
Benjamin Peterson 2012-02-21 11:24:21 -05:00
commit 9d7601fcea
4 changed files with 14 additions and 4 deletions

View file

@ -6538,6 +6538,7 @@ unicode_hash(PyUnicodeObject *self)
register Py_UNICODE *p;
register long x;
assert(_Py_HashSecret_Initialized);
if (self->hash != -1)
return self->hash;
len = PyUnicode_GET_SIZE(self);