[py3k] Import builtins from six.moves

3 files changed, 7 insertions, 3 deletions

diff --git a/cli.py b/cli.py
index 4283732..a96ce17 100644
--- a/cli.py
+++ b/cli.py
@@ -44,7 +44,9 @@ Example::
 
 __docformat__ = "restructuredtext en"
 
-from logilab.common.compat import raw_input, builtins
+from six.moves import builtins
+
+from logilab.common.compat import raw_input
 if not hasattr(builtins, '_'):
     builtins._ = str
 
diff --git a/compat.py b/compat.py
index 6eafba8..5136b39 100644
--- a/compat.py
+++ b/compat.py
@@ -34,7 +34,8 @@ import sys
 import types
 from warnings import warn
 
-import __builtin__ as builtins # 2to3 will tranform '__builtin__' to 'builtins'
+# not used here, but imported to preserve API
+from six.moves import builtins
 
 if sys.version_info < (3, 0):
     str_to_bytes = str
diff --git a/testlib.py b/testlib.py
index c3cf17e..85fd918 100644
--- a/testlib.py
+++ b/testlib.py
@@ -59,8 +59,9 @@ from ConfigParser import ConfigParser
 from itertools import dropwhile
 from inspect import isgeneratorfunction
 
+from six.moves import builtins
+
 from logilab.common.deprecation import deprecated
-from logilab.common.compat import builtins
 
 import unittest as unittest_legacy
 if not getattr(unittest_legacy, "__package__", None):