diff options
| author | Stefan Krah <skrah@bytereef.org> | 2012-04-09 19:31:06 (GMT) |
|---|---|---|
| committer | Stefan Krah <skrah@bytereef.org> | 2012-04-09 19:31:06 (GMT) |
| commit | f93fc0411bef9bb1fc781cc76427b6e52c7affd9 (patch) | |
| tree | b7979d10570887a71f975bab5051de56160c8ebd | |
| parent | e37f8b29fcba54807c5b60208b68de379a8dd01a (diff) | |
| parent | 4a1e7cb06c09c7c7146b4c8a3f35419c379a1143 (diff) | |
| download | cpython-f93fc0411bef9bb1fc781cc76427b6e52c7affd9.zip cpython-f93fc0411bef9bb1fc781cc76427b6e52c7affd9.tar.gz cpython-f93fc0411bef9bb1fc781cc76427b6e52c7affd9.tar.bz2 | |
Merge.
| -rw-r--r-- | Doc/howto/logging-cookbook.rst | 2 | ||||
| -rw-r--r-- | Objects/object.c | 2 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst index 9511d59..5e9321a 100644 --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -1377,7 +1377,7 @@ works:: A simple handler for logging events. It runs in the listener process and dispatches events to loggers based on the name in the received record, which then get dispatched, by the logging system, to the handlers - configured for those records. + configured for those loggers. """ def handle(self, record): logger = logging.getLogger(record.name) diff --git a/Objects/object.c b/Objects/object.c index 5bafbc0..c8c1861 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -763,7 +763,9 @@ _Py_HashBytes(unsigned char *p, Py_ssize_t len) We make the hash of the empty string be 0, rather than using (prefix ^ suffix), since this slightly obfuscates the hash secret */ +#ifdef Py_DEBUG assert(_Py_HashSecret_Initialized); +#endif if (len == 0) { return 0; } diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index bff33d9..7e73bc2 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -11335,7 +11335,9 @@ unicode_hash(PyObject *self) Py_ssize_t len; Py_uhash_t x; +#ifdef Py_DEBUG assert(_Py_HashSecret_Initialized); +#endif if (_PyUnicode_HASH(self) != -1) return _PyUnicode_HASH(self); if (PyUnicode_READY(self) == -1) |