From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 8 Jan 2007 18:51:46 +0000 (+0000)
Subject: Bare except clause removed from LogRecord.__init__. Now, only ValueError, TypeError... 
X-Git-Tag: v2.6a1~2305
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cd79f6b7871c65523153f3d44c8e6f895f415ca;p=python

Bare except clause removed from LogRecord.__init__. Now, only ValueError, TypeError and AttributeError are trapped.
(SF #411881)
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index c72730843e..797fac6eed 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -41,8 +41,8 @@ except ImportError:
 
 __author__  = "Vinay Sajip <vinay_sajip@red-dove.com>"
 __status__  = "production"
-__version__ = "0.4.9.9"
-__date__    = "06 February 2006"
+__version__ = "0.5.0.0"
+__date__    = "08 January 2007"
 
 #---------------------------------------------------------------------------
 #   Miscellaneous module data
@@ -243,7 +243,7 @@ class LogRecord:
         try:
             self.filename = os.path.basename(pathname)
             self.module = os.path.splitext(self.filename)[0]
-        except:
+        except (TypeError, ValueError, AttributeError):
             self.filename = pathname
             self.module = "Unknown module"
         self.exc_info = exc_info