Removed __builtin__ and buffer hack for MySQLdb for Py3

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index aeafb76475a11362d8e4f97b980bd6658e3c266b..8ea8c36dd85a818f16e6d9293622d935e830c610 100644 (file)
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -5,7 +5,9 @@
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 import inspect, itertools, operator, sys, warnings, weakref
+# Py2K
 import __builtin__
+# end Py2K
 types = __import__('types')
 
 from sqlalchemy import exc
@@ -51,11 +53,13 @@ else:
     except ImportError:
         import pickle
 
+# Py2K
 # a controversial feature, required by MySQLdb currently
 def buffer(x):
     return x 
     
 buffer = getattr(__builtin__, 'buffer', buffer)
+# end Py2K
         
 if sys.version_info >= (2, 5):
     class PopulateDict(dict):