diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-02-21 11:09:13 -0500 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-02-21 11:09:13 -0500 |
| commit | 62aaab18d86502423ed85bbdde188374b54abf7e (patch) | |
| tree | 08506ded956cb3cca9bb8f6fd33ef18129c45752 /Objects | |
| parent | 0e06236a81fcc0a8fc1e612f5ac0a5bf55a2daae (diff) | |
| parent | 64adc7fe1df0af55c913a6169c87ebb43b7961b2 (diff) | |
| download | cpython-62aaab18d86502423ed85bbdde188374b54abf7e.tar.gz | |
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 d63fabcc9e..62ddf21532 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 467f95c444..b70666106d 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); |