diff options
author | Rémi Cardona <remi.cardona@free.fr> | 2014-07-14 18:54:49 +0200 |
---|---|---|
committer | Rémi Cardona <remi.cardona@free.fr> | 2014-07-14 18:54:49 +0200 |
commit | a10a0298ba6a59b37febfedaeca599c50de71e13 (patch) | |
tree | a8d215a95400aef06caf22c1b8efc532dc3d0a6c | |
parent | c7569393fbdd47253c22bf606e82cf1e3ea30fd6 (diff) | |
download | logilab-common-a10a0298ba6a59b37febfedaeca599c50de71e13.tar.gz |
[py3k] Import builtins from six.moves
-rw-r--r-- | cli.py | 4 | ||||
-rw-r--r-- | compat.py | 3 | ||||
-rw-r--r-- | testlib.py | 3 |
3 files changed, 7 insertions, 3 deletions
@@ -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 @@ -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 @@ -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): |