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

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 033fecdaae41e7e35d600c17ee0e7580a30b7e43..e64d86bc6b3103642fc52c7bb092e7e9d8dcc1be 100644 (file)
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -284,12 +284,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:

diff --git a/Misc/NEWS b/Misc/NEWS
index 4a82a5e879c582c4eb46ecca0777103b63337ebc..e0dd0cc6dd36b66728035bf53dd94847dcc1a5fc 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.2 Alpha 1?
 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 @@ C-API
 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 @@ Core and Builtins
 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.