more platform neutral way of getting at 'buffer'

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 1356fa324bb57699ba0b18441e01c5ad541c2ec0..3b787c9546a6cbdcd9ebdbabf423888fdfd30bc2 100644 (file)
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -49,11 +49,11 @@ else:
     except ImportError:
         import pickle
 
-if py3k:
-    def buffer(x):
-        return x # no-op until we figure out what MySQLdb is going to use
-else:
-    buffer = __builtin__.buffer
+# a controversial feature, required by MySQLdb currently
+def buffer(x):
+    return x 
+    
+buffer = getattr(__builtin__, 'buffer', buffer)
         
 if sys.version_info >= (2, 5):
     class PopulateDict(dict):