mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-29 19:56:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge.

Browse source
This commit is contained in:
Stefan Krah 2012-04-09 21:31:06 +02:00
commit f93fc0411b
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/howto/logging-cookbook.rst
View file

@ -1377,7 +1377,7 @@ works::
A simple handler for logging events. It runs in the listener process and 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, dispatches events to loggers based on the name in the received record,
which then get dispatched, by the logging system, to the handlers which then get dispatched, by the logging system, to the handlers
configured for those records. configured for those loggers.
""" """
def handle(self, record): def handle(self, record):
logger = logging.getLogger(record.name) logger = logging.getLogger(record.name)

2
Objects/object.c
View file

@ -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 We make the hash of the empty string be 0, rather than using
(prefix ^ suffix), since this slightly obfuscates the hash secret (prefix ^ suffix), since this slightly obfuscates the hash secret
*/ */
#ifdef Py_DEBUG
assert(_Py_HashSecret_Initialized); assert(_Py_HashSecret_Initialized);
#endif
if (len == 0) { if (len == 0) {
return 0; return 0;
} }

2
Objects/unicodeobject.c
View file

@ -11335,7 +11335,9 @@ unicode_hash(PyObject *self)
Py_ssize_t len; Py_ssize_t len;
Py_uhash_t x; Py_uhash_t x;
#ifdef Py_DEBUG
assert(_Py_HashSecret_Initialized); assert(_Py_HashSecret_Initialized);
#endif
if (_PyUnicode_HASH(self) != -1) if (_PyUnicode_HASH(self) != -1)
return _PyUnicode_HASH(self); return _PyUnicode_HASH(self);
if (PyUnicode_READY(self) == -1) if (PyUnicode_READY(self) == -1)