From 67042ac48ff646db137292bdfc7cbc17f937def3 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 29 Apr 2009 22:25:37 -0400 Subject: [PATCH] Fix showwarning capturing for pytools.log on Py2.5 and older. --- src/log.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/log.py b/src/log.py index 94f4a7f..d5c1e36 100644 --- a/src/log.py +++ b/src/log.py @@ -276,7 +276,11 @@ class LogManager(object): # FIXME warning capture on multiple processors def _showwarning(message, category, filename, lineno, file=None, line=None): - self.old_showwarning(message, category, filename, lineno, file, line) + try: + self.old_showwarning(message, category, filename, lineno, file, line) + except TypeError: + # cater to Python 2.5 and earlier + self.old_showwarning(message, category, filename, lineno) if (self.db_conn is not None and self.schema_version >= 1 -- GitLab