0.2.2 prep, added "pickler" option to Pickle type

2 files changed, 4 insertions, 9 deletions

diff --git a/lib/sqlalchemy/engine/threadlocal.py b/lib/sqlalchemy/engine/threadlocal.py
index 1d99f9ce8..913c6425a 100644
--- a/lib/sqlalchemy/engine/threadlocal.py
+++ b/lib/sqlalchemy/engine/threadlocal.py
@@ -15,11 +15,6 @@ class TLSession(object):
             return self.__transaction._increment_connect()
         except AttributeError:
             return TLConnection(self, close_with_result=close_with_result)
-    def set_transaction(self, tlconnection, trans):
-        if self.__tcount == 0:
-            self.__transaction = tlconnection
-            self.__trans = trans
-        self.__tcount += 1
     def reset(self):
         try:
             self.__transaction._force_close()
diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index 65b5d14fa..5fc75678d 100644
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -199,19 +199,19 @@ class Binary(TypeEngine):
 
 class PickleType(TypeDecorator):
     impl = Binary
-    def __init__(self, protocol=pickle.HIGHEST_PROTOCOL):
-       """allows the pickle protocol to be specified"""
+    def __init__(self, protocol=pickle.HIGHEST_PROTOCOL, pickler=None):
        self.protocol = protocol
+       self.pickler = pickler or pickle
        super(PickleType, self).__init__()
     def convert_result_value(self, value, dialect):
       if value is None:
           return None
       buf = self.impl.convert_result_value(value, dialect)
-      return pickle.loads(str(buf))
+      return self.pickler.loads(str(buf))
     def convert_bind_param(self, value, dialect):
       if value is None:
           return None
-      return self.impl.convert_bind_param(pickle.dumps(value, self.protocol), dialect)
+      return self.impl.convert_bind_param(self.pickler.dumps(value, self.protocol), dialect)
 
 class Boolean(TypeEngine):
     pass