[Python-checkins] r75425 - in python/branches/release26-maint: Lib/logging/__init__.py Misc/NEWS
vinay.sajip
python-checkins at python.org
Wed Oct 14 21:53:24 CEST 2009
Author: vinay.sajip
Date: Wed Oct 14 21:53:23 2009
New Revision: 75425
Log:
Issue #7120: logging: Removed import of multiprocessing which is causing crash in GAE.
Modified:
python/branches/release26-maint/Lib/logging/__init__.py
python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Lib/logging/__init__.py
==============================================================================
--- python/branches/release26-maint/Lib/logging/__init__.py (original)
+++ python/branches/release26-maint/Lib/logging/__init__.py Wed Oct 14 21:53:23 2009
@@ -273,12 +273,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:
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Wed Oct 14 21:53:23 2009
@@ -18,12 +18,15 @@
Library
-------
-- Issue #7115: Fixed the extension module builds that is failing when using
+- 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.
- Issue #7068: Fixed the partial renaming that occured in r72594.
-- Issue #7064: Fixed the incompatibility with Setuptools in distutils
+- Issue #7064: Fixed the incompatibility with Setuptools in distutils
when running the build_ext command.
- Issue #7052: Removed nonexisting NullHandler from logging.__all__.
@@ -127,7 +130,7 @@
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 #6790: Make it possible again to pass an `array.array` to
`httplib.HTTPConnection.send`. Patch by Kirk McDonald.
@@ -177,7 +180,7 @@
- Issue #1424152: Fix for httplib, urllib2 to support SSL while working through
proxy. Original patch by Christopher Li, changes made by Senthil Kumaran.
-- Issues #5155, 5313, 5331: multiprocessing.Process._bootstrap was
+- Issues #5155, 5313, 5331: multiprocessing.Process._bootstrap was
unconditionally calling "os.close(sys.stdin.fileno())" resulting in file
descriptor errors
@@ -277,7 +280,7 @@
- Issue #2622: Fixed an ImportError when importing email.messsage from a
standalone application built with py2exe or py2app.
-- Issue #6455: Fixed test_build_ext under win32.
+- Issue #6455: Fixed test_build_ext under win32.
- Issue #6403: Fixed package path usage in build_ext.
More information about the Python-checkins
mailing list