| commit | e249dcab7ad8b1bd3b84a44974cfe2746e4269d1 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Tue Feb 21 11:09:13 2012 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Tue Feb 21 11:09:13 2012 -0500 |
| tree | eaf152bad01062780b3901e1c27ab6e2719b6eaf | |
| parent | 4fe85abab9f0188733e654a72353217b43f95920 [diff] [blame] | |
| parent | 69e9727657dad167215b656de910d95cefe1ee45 [diff] [blame] |
merge 3.2
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index 85c5c4d..8f571ad 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c
@@ -2784,6 +2784,7 @@ register unsigned char *p; register Py_hash_t x; + assert(_Py_HashSecret_Initialized); p = (unsigned char *) data; x = _Py_HashSecret.prefix; x ^= *p << 7;