[py3k] compat : __builtin__ will be replaced by builtins in py3k

4 files changed, 14 insertions, 18 deletions

diff --git a/cli.py b/cli.py
index 5969eb3..0d716e4 100644
--- a/cli.py
+++ b/cli.py
@@ -44,11 +44,9 @@ Example::
 
 __docformat__ = "restructuredtext en"
 
-import __builtin__
-if not hasattr(__builtin__, '_'):
-    __builtin__._ = str
-
-from logilab.common.compat import raw_input
+from logilab.common.compat import raw_input, builtins
+if not hasattr(builtins, '_'):
+    builtins._ = str
 
 
 def init_readline(complete_method, histfile=None):
diff --git a/compat.py b/compat.py
index b91f922..5a23bc3 100644
--- a/compat.py
+++ b/compat.py
@@ -28,7 +28,7 @@ import os
 import sys
 from warnings import warn
 
-import __builtin__
+import __builtin__ as builtins # 2to3 will tranform '__builtin__' to 'builtins'
 
 try:
     callable = callable
@@ -214,7 +214,7 @@ except TypeError:
         key= kargs.pop("key", None)
         #default implementation
         if key is None:
-            return __builtin__.max(*args,**kargs)
+            return builtins.max(*args,**kargs)
 
         for karg in kargs:
             raise TypeError("unexpected keyword argument %s for function max") % karg
diff --git a/pytest.py b/pytest.py
index 5868dfd..cc9e37b 100644
--- a/pytest.py
+++ b/pytest.py
@@ -123,8 +123,6 @@ import unittest
 
 import imp
 
-import __builtin__
-
 
 try:
     import django
diff --git a/test/unittest_compat.py b/test/unittest_compat.py
index 83d7e81..d31a562 100644
--- a/test/unittest_compat.py
+++ b/test/unittest_compat.py
@@ -20,7 +20,7 @@
 from logilab.common.testlib import TestCase, unittest_main
 import sys
 import types
-import __builtin__
+from logilab.common.compat import builtins
 import pprint
 
 class CompatTCMixIn:
@@ -39,8 +39,8 @@ class CompatTCMixIn:
         for modname in self.MODNAMES:
             del sys.modules[modname]
         for funcname, func in self.builtins_backup.items():
-            setattr(__builtin__, funcname, func)
-            # delattr(__builtin__, 'builtin_%s' % funcname)
+            setattr(builtins, funcname, func)
+            # delattr(builtins, 'builtin_%s' % funcname)
         for modname, mod in self.modules_backup.items():
             sys.modules[modname] = mod
         try:
@@ -50,18 +50,18 @@ class CompatTCMixIn:
 
     def remove_builtins(self):
         for builtin in self.BUILTINS:
-            func = getattr(__builtin__, builtin, None)
+            func = getattr(builtins, builtin, None)
             if func is not None:
                 self.builtins_backup[builtin] = func
-                delattr(__builtin__, builtin)
-                # setattr(__builtin__, 'builtin_%s' % builtin, func)
+                delattr(builtins, builtin)
+                # setattr(builtins, 'builtin_%s' % builtin, func)
     def alter_builtins(self):
         for builtin, func in self.ALTERED_BUILTINS.iteritems():
-            old_func = getattr(__builtin__, builtin, None)
+            old_func = getattr(builtins, builtin, None)
             if func is not None:
                 self.builtins_backup[builtin] = old_func
-                setattr(__builtin__, builtin, func)
-                # setattr(__builtin__, 'builtin_%s' % builtin, func)
+                setattr(builtins, builtin, func)
+                # setattr(builtins, 'builtin_%s' % builtin, func)
 
     def remove_modules(self):
         for modname in self.MODNAMES: