- starargs_as_list was not actually issuing SAPendingDeprecationWarning, fixed

- implemented code cleanup from [ticket:1152] but not including using the decorators module

1 files changed, 8 insertions, 14 deletions

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 41e191312..2c01cdc17 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -1902,18 +1902,12 @@ def connection_memoize(key):
     connection.  The memo will be stored in ``connection.info[key]``.
 
     """
-    def decorate(fn):
-        spec = inspect.getargspec(fn)
-        assert len(spec[0]) == 2
-        assert spec[0][1] == 'connection'
-        assert spec[1:3] == (None, None)
-
-        def decorated(self, connection):
-            try:
-                return connection.info[key]
-            except KeyError:
-                connection.info[key] = val = fn(self, connection)
-                return val
+    @util.decorator
+    def decorated(fn, self, connection):
+        try:
+            return connection.info[key]
+        except KeyError:
+            connection.info[key] = val = fn(self, connection)
+            return val
 
-        return util.function_named(decorated, fn.__name__)
-    return decorate
+    return decorated