commit | d9a3591ed154158adeded5d52c25c7bee4dadfbd | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Feb 21 11:12:14 2012 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Feb 21 11:12:14 2012 -0500 |
tree | fdd96c72d76e35ee3fe56f5fc8618145b10aeaa5 | |
parent | 8b24506534860b6c1cfa7f53c40113d502f4c78f [diff] [blame] | |
parent | e249dcab7ad8b1bd3b84a44974cfe2746e4269d1 [diff] [blame] |
merge 3.2
diff --git a/Objects/object.c b/Objects/object.c index bb18d47..2665d21 100644 --- a/Objects/object.c +++ b/Objects/object.c
@@ -763,6 +763,7 @@ 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; }