merge 3.1 (#14509)

ca819c3c · Benjamin Peterson · c0aa9eeb · f6622c8a · ca819c3c · ca819c3c
Commit ca819c3c authored Apr 09, 2012 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Objects/bytesobject.c Objects/bytesobject.c +2 -0

Objects/unicodeobject.c Objects/unicodeobject.c +2 -0

No files found.
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -875,7 +875,9 @@ bytes_hash(PyBytesObject *a)
    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);

--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -7673,7 +7673,9 @@ unicode_hash(PyUnicodeObject *self)
    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);