mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-22 06:32:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #7120: logging: Removed import of multiprocessing which is causing crash in GAE.

Browse source
This commit is contained in:
Vinay Sajip 2009-10-16 14:06:44 +00:00
parent 42e30556e5
commit 96d4aa3fca
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/logging/__init__.py
View file

@ -284,12 +284,10 @@ class LogRecord:
self.threadName = None self.threadName = None
if not logMultiprocessing: if not logMultiprocessing:
self.processName = None self.processName = None
elif 'multiprocessing' not in sys.modules:
self.processName = 'MainProcess'
else: else:
try: self.processName = sys.modules['multiprocessing'].current_process().name
from multiprocessing import current_process
self.processName = current_process().name
except ImportError:
self.processName = None
if logProcesses and hasattr(os, 'getpid'): if logProcesses and hasattr(os, 'getpid'):
self.process = os.getpid() self.process = os.getpid()
else: else:

9
Misc/NEWS
View file

@ -12,6 +12,9 @@ What's New in Python 3.2 Alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #7120: logging: Removed import of multiprocessing which is causing
crash in GAE.
- Issue #1754094: Improve the stack depth calculation in the compiler. - Issue #1754094: Improve the stack depth calculation in the compiler.
There should be no other effect than a small decrease in memory use. There should be no other effect than a small decrease in memory use.
Patch by Christopher Tur Lesniewski-Laas. Patch by Christopher Tur Lesniewski-Laas.
@ -94,11 +97,11 @@ C-API
Library Library
------- -------
- Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment - Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment
- Issue #7086: Added TCP support to SysLogHandler, and tidied up some - Issue #7086: Added TCP support to SysLogHandler, and tidied up some
anachronisms in the code which were a relic of 1.5.2 compatibility. anachronisms in the code which were a relic of 1.5.2 compatibility.
- Issue #7082: When falling back to the MIME 'name' parameter, the - Issue #7082: When falling back to the MIME 'name' parameter, the
correct place to look for it is the Content-Type header. correct place to look for it is the Content-Type header.
@ -1116,7 +1119,7 @@ Core and Builtins
Library Library
------- -------
- Issue #6516: Added owner/group support when creating tar archives in - Issue #6516: Added owner/group support when creating tar archives in
Distutils. Distutils.
- Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils. - Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils.