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

@ -1262,6 +1262,7 @@ string_hash(PyStringObject *a)
register unsigned char *p;
register long x;
assert(_Py_HashSecret_Initialized);
if (a->ob_shash != -1)
return a->ob_shash;
len = Py_SIZE(a);