- make frozendict serializable

- serialize tests use HIGHEST_PROTOCOL

2 files changed, 5 insertions, 2 deletions

diff --git a/lib/sqlalchemy/ext/serializer.py b/lib/sqlalchemy/ext/serializer.py
index fd456e385..90be39eaf 100644
--- a/lib/sqlalchemy/ext/serializer.py
+++ b/lib/sqlalchemy/ext/serializer.py
@@ -131,9 +131,9 @@ def Deserializer(file, metadata=None, scoped_session=None, engine=None):
     unpickler.persistent_load = persistent_load
     return unpickler
 
-def dumps(obj):
+def dumps(obj, protocol=0):
     buf = byte_buffer()
-    pickler = Serializer(buf)
+    pickler = Serializer(buf, protocol)
     pickler.dump(obj)
     return buf.getvalue()
     
diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index f8be5c3fd..9f9235450 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -154,6 +154,9 @@ class frozendict(dict):
     def __init__(self, *args):
         pass
 
+    def __reduce__(self):
+        return frozendict, (dict(self), )
+
     def union(self, d):
         if not self:
             return frozendict(d)