merged -r5299:5438 of py3k warnings branch. this fixes some sqlite py2.6 testing issues,

and also addresses a significant chunk of py3k deprecations.  It's mainly
expicit __hash__ methods.  Additionally, most usage of sets/dicts to store columns uses
util-based placeholder names.

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 0fc7c8fbd..9c6c48e0f 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -1034,7 +1034,7 @@ class _BinaryType(sqltypes.Binary):
             if value is None:
                 return None
             else:
-                return buffer(value)
+                return util.buffer(value)
         return process
 
 class MSVarBinary(_BinaryType):
@@ -1081,7 +1081,7 @@ class MSBinary(_BinaryType):
             if value is None:
                 return None
             else:
-                return buffer(value)
+                return util.buffer(value)
         return process
 
 class MSBlob(_BinaryType):
@@ -1108,7 +1108,7 @@ class MSBlob(_BinaryType):
             if value is None:
                 return None
             else:
-                return buffer(value)
+                return util.buffer(value)
         return process
 
     def __repr__(self):