From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 24 Jan 2012 00:16:36 +0000 (-0500)
Subject: don't need to use __builtin__ for these things, doesn't work in py3k
X-Git-Tag: rel_0_7_5~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f02433d7aafe1eba9c4f90863d1d4de6673ab1db;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

don't need to use __builtin__ for these things, doesn't work in py3k
---

diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 3a92098263..07652f3c6c 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -8,9 +8,6 @@
 
 import sys
 
-# Py2K
-import __builtin__
-# end Py2K
 
 try:
     import threading
@@ -56,7 +53,7 @@ def buffer(x):
     return x 
 
 # Py2K
-buffer = getattr(__builtin__, 'buffer', buffer)
+buffer = buffer
 # end Py2K
 
 try:
@@ -104,9 +101,9 @@ if py3k_warning:
 
     from functools import reduce
 else:
-    callable = __builtin__.callable
-    cmp = __builtin__.cmp
-    reduce = __builtin__.reduce
+    callable = callable
+    cmp = cmp
+    reduce = reduce
 
 try:
     from collections import defaultdict
@@ -193,7 +190,7 @@ else:
     time_func = time.time 
 
 if sys.version_info >= (2, 5):
-    any = __builtin__.any
+    any = any
 else:
     def any(iterator):
         for item in iterator: