Issue #7120: logging: Removed import of multiprocessing which is causing crash in GAE.
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 033fecd..e64d86b 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -284,12 +284,10 @@
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:
diff --git a/Misc/NEWS b/Misc/NEWS
index 4a82a5e..e0dd0cc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
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.
There should be no other effect than a small decrease in memory use.
Patch by Christopher Tur Lesniewski-Laas.
@@ -94,11 +97,11 @@
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
anachronisms in the code which were a relic of 1.5.2 compatibility.
-
+
- Issue #7082: When falling back to the MIME 'name' parameter, the
correct place to look for it is the Content-Type header.
@@ -1116,7 +1119,7 @@
Library
-------
-- Issue #6516: Added owner/group support when creating tar archives in
+- Issue #6516: Added owner/group support when creating tar archives in
Distutils.
- Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils.