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

@ -875,6 +875,7 @@ bytes_hash(PyBytesObject *a)
register unsigned char *p;
register Py_hash_t x;
assert(_Py_HashSecret_Initialized);
if (a->ob_shash != -1)
return a->ob_shash;
len = Py_SIZE(a);