commit ca819c3c9d2651bcaeec311915a83dd176acbd13
author Benjamin Peterson <benjamin@python.org> Mon Apr 09 15:01:02 2012 -0400
committer Benjamin Peterson <benjamin@python.org> Mon Apr 09 15:01:02 2012 -0400
tree 14a101ac97c95dec3c1608556b6e9b52c181ebc3
parent c0aa9eeb90204b8a67a610180c003c182d1691aa
parent f6622c8a3e6bdf92778359417d0fa6c3e6bda909

merge 3.1 (#14509)

Objects/bytesobject.c

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 62ddf21..796e400 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -875,7 +875,9 @@
     register unsigned char *p;
     register Py_hash_t x;
 
+#ifdef Py_DEBUG
     assert(_Py_HashSecret_Initialized);
+#endif
     if (a->ob_shash != -1)
         return a->ob_shash;
     len = Py_SIZE(a);

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index a5ffc56..cd17789 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -7673,7 +7673,9 @@
     Py_UNICODE *p;
     Py_hash_t x;
 
+#ifdef Py_DEBUG
     assert(_Py_HashSecret_Initialized);
+#endif
     if (self->hash != -1)
         return self->hash;
     len = Py_SIZE(self);