diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-04-09 14:54:09 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-04-09 14:54:09 -0400 |
| commit | fe146ea3c72b573974dfc2e8e6a60534f9e612a7 (patch) | |
| tree | e7e299f053f1f036f12a2c9d78def3e9be988b57 | |
| parent | b5588c3f94b351c7c57fd7d26a305200b5a6c45f (diff) | |
| parent | f51c384a0af9cc233b52ea98313e312dcb414dce (diff) | |
| download | cpython-git-fe146ea3c72b573974dfc2e8e6a60534f9e612a7.tar.gz | |
merge 2.7 release branch
| -rw-r--r-- | Objects/stringobject.c | 2 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 982679258b..ab377dd7a2 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -1262,7 +1262,9 @@ string_hash(PyStringObject *a) register unsigned char *p; register long x; +#ifdef Py_DEBUG assert(_Py_HashSecret_Initialized); +#endif if (a->ob_shash != -1) return a->ob_shash; len = Py_SIZE(a); diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 0ee61c96b3..3dfbea1cc5 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -6538,7 +6538,9 @@ unicode_hash(PyUnicodeObject *self) register Py_UNICODE *p; register long x; +#ifdef Py_DEBUG assert(_Py_HashSecret_Initialized); +#endif if (self->hash != -1) return self->hash; len = PyUnicode_GET_SIZE(self); |