Commit c2212d87 authored by Vinay Sajip's avatar Vinay Sajip

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

parent 95159f32
......@@ -273,12 +273,10 @@ class LogRecord:
self.threadName = None
if not logMultiprocessing:
self.processName = None
elif 'multiprocessing' not in sys.modules:
self.processName = 'MainProcess'
else:
try:
from multiprocessing import current_process
self.processName = current_process().name
except ImportError:
self.processName = None
self.processName = sys.modules['multiprocessing'].current_process().name
if logProcesses and hasattr(os, 'getpid'):
self.process = os.getpid()
else:
......
......@@ -18,6 +18,9 @@ Core and Builtins
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
paths in the extension name instead of dotted names.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment