commit 64ed576de8102fc26a6f550f3cca8dcf2c8b6f38
author Benjamin Peterson <benjamin@python.org> Mon Apr 09 15:04:39 2012 -0400
committer Benjamin Peterson <benjamin@python.org> Mon Apr 09 15:04:39 2012 -0400
tree 8fd2d4ccf2f007806f643419b38d0dd292b2a8c3
parent 0c0914edb0fba3e31d6ad3aa70ef1822c21782f6
parent ca819c3c9d2651bcaeec311915a83dd176acbd13

merge 3.2 (#14509)

Objects/object.c

diff --git a/Objects/object.c b/Objects/object.c
index 5bafbc0..c8c1861 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -763,7 +763,9 @@
       We make the hash of the empty string be 0, rather than using
       (prefix ^ suffix), since this slightly obfuscates the hash secret
     */
+#ifdef Py_DEBUG
     assert(_Py_HashSecret_Initialized);
+#endif
     if (len == 0) {
         return 0;
     }

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index bff33d9..7e73bc2 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -11335,7 +11335,9 @@
     Py_ssize_t len;
     Py_uhash_t x;
 
+#ifdef Py_DEBUG
     assert(_Py_HashSecret_Initialized);
+#endif
     if (_PyUnicode_HASH(self) != -1)
         return _PyUnicode_HASH(self);
     if (PyUnicode_READY(self) == -1)