diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-21 16:09:13 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-21 16:09:13 (GMT) |
| commit | e249dcab7ad8b1bd3b84a44974cfe2746e4269d1 (patch) | |
| tree | eaf152bad01062780b3901e1c27ab6e2719b6eaf /Objects | |
| parent | 4fe85abab9f0188733e654a72353217b43f95920 (diff) | |
| parent | 69e9727657dad167215b656de910d95cefe1ee45 (diff) | |
| download | cpython-e249dcab7ad8b1bd3b84a44974cfe2746e4269d1.zip cpython-e249dcab7ad8b1bd3b84a44974cfe2746e4269d1.tar.gz cpython-e249dcab7ad8b1bd3b84a44974cfe2746e4269d1.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/bytesobject.c | 1 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index d63fabc..62ddf21 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -875,6 +875,7 @@ bytes_hash(PyBytesObject *a) register unsigned char *p; register Py_hash_t x; + assert(_Py_HashSecret_Initialized); if (a->ob_shash != -1) return a->ob_shash; len = Py_SIZE(a); diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 467f95c..b706661 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -7673,6 +7673,7 @@ unicode_hash(PyUnicodeObject *self) Py_UNICODE *p; Py_hash_t x; + assert(_Py_HashSecret_Initialized); if (self->hash != -1) return self->hash; len = Py_SIZE(self); |