From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 19 Dec 2008 15:32:31 +0000 (+0000)
Subject: more platform neutral way of getting at 'buffer'
X-Git-Tag: rel_0_5_0~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16ef52392c55341ae94edfca5e4feafe216844a4;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

more platform neutral way of getting at 'buffer'
---

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 1356fa324b..3b787c9546 100644
--- 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):