From: Jason Kirtland <jek@discorporate.us>
Date: Fri, 8 Feb 2008 20:38:28 +0000 (+0000)
Subject: - psycopg2 can raise un-str()able exceptions; don't croak when trying to log them
X-Git-Tag: rel_0_4_3~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=426b6d9baf35585698540fefc4ef2bed0e10242f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- psycopg2 can raise un-str()able exceptions; don't croak when trying to log them
---

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index d177dc10d5..aa30e2a2a0 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -430,7 +430,12 @@ class _CursorFairy(object):
         try:
             self.cursor.close()
         except Exception, e:
-            self.__parent._logger.warn("Error closing cursor: " + e)
+            try:
+                ex_text = str(e)
+            except TypeError:
+                ex_text = repr(e)
+            self.__parent._logger.warn("Error closing cursor: " + ex_text)
+
             if isinstance(e, (SystemExit, KeyboardInterrupt)):
                 raise