- The "pool.manage" feature doesn't use pickle

anymore to hash the arguments for each pool.

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 6d7542fb5..2edafbf38 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -20,7 +20,7 @@ import weakref, time, traceback
 
 from sqlalchemy import exc, log, event, events, interfaces, util
 from sqlalchemy.util import queue as sqla_queue
-from sqlalchemy.util import threading, pickle, memoized_property, \
+from sqlalchemy.util import threading, memoized_property, \
     chop_traceback
 
 proxies = {}
@@ -952,4 +952,7 @@ class _DBProxy(object):
             pass
 
     def _serialize(self, *args, **kw):
-        return pickle.dumps([args, kw])
+        return tuple(
+            list(args) + 
+            [(k, kw[k]) for k in sorted(kw)]
+        )