[Python-checkins] cpython (merge 3.2 -> default): Closes #13859: Merged fix from 3.2 - thanks to Matt Joiner for spotting this

Wed Jan 25 18:50:25 CET 2012

http://hg.python.org/cpython/rev/fec45282dc28
changeset: 74614:fec45282dc28
parent: 74612:2b62348a1c03
parent: 74613:e506848d6381
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Wed Jan 25 17:49:45 2012 +0000
summary:
 Closes #13859: Merged fix from 3.2 - thanks to Matt Joiner for spotting this and the patch.
files:
 Lib/logging/__init__.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2001-2011 by Vinay Sajip. All Rights Reserved.
+# Copyright 2001-2012 by Vinay Sajip. All Rights Reserved.
 #
 # Permission to use, copy, modify, and distribute this software and its
 # documentation for any purpose and without fee is hereby granted,
@@ -288,7 +288,7 @@
 # for an example
 try:
 self.processName = mp.current_process().name
- except StandardError: #pragma: no cover
+ except Exception: #pragma: no cover
 pass
 if logProcesses and hasattr(os, 'getpid'):
 self.process = os.getpid()
-- 
Repository URL: http://hg.python.org/cpython
