From 956c144c7feae68fa957eb62ede4b21cd818c737 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 26 May 2013 13:08:24 -0400
Subject: fix serializer tests.  something is wrong with non-C pickle but for
 some reason py3k's pickle seems to be OK?  not sure why that is, as this is
 all related to http://bugs.python.org/issue998998

---
 lib/sqlalchemy/ext/serializer.py | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'lib/sqlalchemy/ext')

diff --git a/lib/sqlalchemy/ext/serializer.py b/lib/sqlalchemy/ext/serializer.py
index 759652014..8abd1fdf3 100644
--- a/lib/sqlalchemy/ext/serializer.py
+++ b/lib/sqlalchemy/ext/serializer.py
@@ -58,26 +58,9 @@ from ..orm.interfaces import MapperProperty
 from ..orm.attributes import QueryableAttribute
 from .. import Table, Column
 from ..engine import Engine
-from ..util import pickle
+from ..util import pickle, byte_buffer, b64encode, b64decode
 import re
-import base64
-# start Py3K
-from io import BytesIO as byte_buffer
-# end Py3K
-# start Py2K
-#from cStringIO import StringIO as byte_buffer
-# end Py2K
-
-# start Py3K
-def b64encode(x):
-    return base64.b64encode(x).decode('ascii')
-def b64decode(x):
-    return base64.b64decode(x.encode('ascii'))
-# end Py3K
-# start Py2K
-#b64encode = base64.b64encode
-#b64decode = base64.b64decode
-# end Py2K
+
 
 __all__ = ['Serializer', 'Deserializer', 'dumps', 'loads']
 
-- 
cgit v1.2.1