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

@ -763,6 +763,7 @@ _Py_HashBytes(unsigned char *p, Py_ssize_t len)
We make the hash of the empty string be 0, rather than using
(prefix ^ suffix), since this slightly obfuscates the hash secret
*/
assert(_Py_HashSecret_Initialized);
if (len == 0) {
return 0;
}