mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-19 08:11:46 +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-14 19:53:23 +00:00
parent 7f7327014c
commit dd3aa9afee
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/logging/__init__.py
View file

@ -273,12 +273,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:

3
Misc/NEWS
View file

@ -18,6 +18,9 @@ Core and Builtins
Library Library
------- -------
- Issue #7120: logging: Removed import of multiprocessing which is causing
crash in GAE.
- Issue #7115: Fixed the extension module builds that is failing when using - Issue #7115: Fixed the extension module builds that is failing when using
paths in the extension name instead of dotted names. paths in the extension name instead of dotted names.