commit d9a3591ed154158adeded5d52c25c7bee4dadfbd
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
parent e249dcab7ad8b1bd3b84a44974cfe2746e4269d1

merge 3.2

Objects/object.c

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;
     }

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 75e9923..a42aad9 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -11214,6 +11214,7 @@
     Py_ssize_t len;
     Py_uhash_t x;
 
+    assert(_Py_HashSecret_Initialized);
     if (_PyUnicode_HASH(self) != -1)
         return _PyUnicode_HASH(self);
     if (PyUnicode_READY(self) == -1)