From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 25 May 2009 15:29:18 +0000 (+0000)
Subject: merged r5976
X-Git-Tag: rel_0_6_6~211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bca4453af600261109615f8cd5aa7a4f571819ad;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merged r5976
---

diff --git a/CHANGES b/CHANGES
index 165d2ec079..a2ba1c5720 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,13 @@
 CHANGES
 =======
 
+0.5.4p2
+=======
+
+- sql
+    - Repaired the printing of SQL exceptions which are not 
+      based on parameters.
+
 0.5.4p1
 =======
 
diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py
index d9fdd5df92..f72bec6fdb 100644
--- a/lib/sqlalchemy/exc.py
+++ b/lib/sqlalchemy/exc.py
@@ -132,7 +132,7 @@ class DBAPIError(SQLAlchemyError):
         self.connection_invalidated = connection_invalidated
 
     def __str__(self):
-        if len(self.params) > 10:
+        if self.params and len(self.params) > 10:
             return ' '.join((SQLAlchemyError.__str__(self),
                              repr(self.statement),
                              repr(self.params[:2]),