[Python-checkins] cpython (merge 3.2 -> default): merge 3.2 (#14509)

Mon Apr 9 21:06:05 CEST 2012

http://hg.python.org/cpython/rev/c20f604a2da6
changeset: 76193:c20f604a2da6
parent: 76184:02ecb8261cd8
parent: 76192:5168483316b5
user: Benjamin Peterson <benjamin at python.org>
date: Mon Apr 09 15:04:39 2012 -0400
summary:
 merge 3.2 (#14509)
files:
 Objects/object.c | 2 ++
 Objects/unicodeobject.c | 2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Objects/object.c b/Objects/object.c
--- 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;
 }
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- 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)
-- 
Repository URL: http://hg.python.org/cpython
