From 8fc5005dfe3eb66a46470ad8a8c7b95fc4d6bdca Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 6 Aug 2009 21:11:27 +0000
Subject: merge 0.6 series to trunk.

---
 lib/sqlalchemy/exc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/sqlalchemy/exc.py')

diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py
index ce130ce3c..f1678743d 100644
--- a/lib/sqlalchemy/exc.py
+++ b/lib/sqlalchemy/exc.py
@@ -103,6 +103,7 @@ class DBAPIError(SQLAlchemyError):
 
     """
 
+    @classmethod
     def instance(cls, statement, params, orig, connection_invalidated=False):
         # Don't ever wrap these, just return them directly as if
         # DBAPIError didn't exist.
@@ -115,7 +116,6 @@ class DBAPIError(SQLAlchemyError):
                 cls = glob[name]
 
         return cls(statement, params, orig, connection_invalidated)
-    instance = classmethod(instance)
 
     def __init__(self, statement, params, orig, connection_invalidated=False):
         try:
-- 
cgit v1.2.1