Use six.moves.range and six.moves.builtins

sebastinas · sebastinas · commit 13092bcaa585 · 2015-02-04T18:57:49.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -26,6 +26,7 @@
 import keyword
 import os
 import rlcompleter
+from six.moves import range, builtins
 
 from glob import glob
 
@@ -35,11 +36,6 @@
 from bpython._py3compat import py3
 from bpython.lazyre import LazyReCompile
 
-try:
-    import builtins
-except ImportError:
-    import __builtin__ as builtins
-
 
 # Autocomplete modes
 SIMPLE = 'simple'
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -60,6 +60,7 @@
 
 import locale
 from types import ModuleType
+from six.moves import range
 
 # These are used for syntax highlighting
 from pygments import format
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import contextlib
 import errno
 import functools
@@ -12,6 +13,7 @@
 import threading
 import time
 import unicodedata
+from six.moves import range
 
 from pygments import format
 from bpython._py3compat import PythonLexer
diff --git a/bpython/curtsiesfrontend/replpainter.py b/bpython/curtsiesfrontend/replpainter.py
@@ -2,6 +2,7 @@
 
 import logging
 import itertools
+from six.moves import range
 
 from curtsies import fsarray, fmtstr
 from curtsies.formatstring import linesplit
diff --git a/bpython/history.py b/bpython/history.py
@@ -24,6 +24,7 @@
 import codecs
 import os
 from itertools import islice
+from six.moves import range
 
 from bpython.translations import _
 from bpython.filelock import FileLock
diff --git a/bpython/keys.py b/bpython/keys.py
@@ -22,6 +22,7 @@
 #
 
 import string
+from six.moves import range
 
 
 class KeyMap:
@@ -46,6 +47,7 @@ def __delitem__(self, key):
     def __setitem__(self, key, value):
         self.map[key] = value
 
+
 cli_key_dispatch = KeyMap(tuple())
 urwid_key_dispatch = KeyMap('')
 
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -42,6 +42,7 @@
 import signal
 from types import ModuleType
 from optparse import Option
+from six.moves import range
 
 from pygments.token import Token
 
