From 16ef52392c55341ae94edfca5e4feafe216844a4 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 19 Dec 2008 15:32:31 +0000 Subject: [PATCH] more platform neutral way of getting at 'buffer' --- lib/sqlalchemy/util.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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): -- 2.47.3