Fix references to xrange

takluyver · takluyver · commit 0a3c3bee88db · 2013-10-29T09:15:54.000-07:00
diff --git a/IPython/kernel/channels.py b/IPython/kernel/channels.py
@@ -445,7 +445,7 @@ def flush(self, timeout=1.0):
         # We do the IOLoop callback process twice to ensure that the IOLoop
         # gets to perform at least one full poll.
         stop_time = time.time() + timeout
-        for i in xrange(2):
+        for i in range(2):
             self._flushed = False
             self.ioloop.add_callback(self._flush)
             while not self._flushed and time.time() < stop_time:
diff --git a/IPython/lib/deepreload.py b/IPython/lib/deepreload.py
@@ -93,7 +93,7 @@ def get_parent(globals, level):
             globals['__package__'] = name = modname[:lastdot]
 
     dot = len(name)
-    for x in xrange(level, 1, -1):
+    for x in range(level, 1, -1):
         try:
             dot = name.rindex('.', 0, dot)
         except ValueError:
diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
@@ -708,10 +708,8 @@ def _exception_pprint(obj, p, cycle):
 #: printers for builtin types
 _type_pprinters = {
     int:                        _repr_pprint,
-    long:                       _repr_pprint,
     float:                      _repr_pprint,
     str:                        _repr_pprint,
-    unicode:                    _repr_pprint,
     tuple:                      _seq_pprinter_factory('(', ')', tuple),
     list:                       _seq_pprinter_factory('[', ']', list),
     dict:                       _dict_pprinter_factory('{', '}', dict),
@@ -734,8 +732,10 @@ def _exception_pprint(obj, p, cycle):
 try:
     _type_pprinters[types.DictProxyType] = _dict_pprinter_factory('<dictproxy {', '}>')
     _type_pprinters[types.ClassType] = _type_pprint
-except AttributeError: # Python 3
-    pass
+    _type_pprinters[long] = _repr_pprint
+    _type_pprinters[unicode] = _repr_pprint
+except (AttributeError, NameError): # Python 3
+    _type_pprinters[bytes] = _repr_pprint
     
 try:
     _type_pprinters[xrange] = _repr_pprint
diff --git a/IPython/parallel/client/client.py b/IPython/parallel/client/client.py
@@ -40,7 +40,7 @@
 from IPython.utils.jsonutil import rekey
 from IPython.utils.localinterfaces import localhost, is_local_ip
 from IPython.utils.path import get_ipython_dir
-from IPython.utils.py3compat import cast_bytes, string_types
+from IPython.utils.py3compat import cast_bytes, string_types, xrange
 from IPython.utils.traitlets import (HasTraits, Integer, Instance, Unicode,
                                     Dict, List, Bool, Set, Any)
 from IPython.external.decorator import decorator
@@ -56,11 +56,6 @@
 from .asyncresult import AsyncResult, AsyncHubResult
 from .view import DirectView, LoadBalancedView
 
-if sys.version_info[0] >= 3:
-    # xrange is used in a couple 'isinstance' tests in py2
-    # should be just 'range' in 3k
-    xrange = range
-
 #--------------------------------------------------------------------------
 # Decorators for Client methods
 #--------------------------------------------------------------------------
diff --git a/IPython/parallel/util.py b/IPython/parallel/util.py
@@ -259,7 +259,7 @@ def _execute(code):
 def select_random_ports(n):
     """Selects and return n random ports that are available."""
     ports = []
-    for i in xrange(n):
+    for i in range(n):
         sock = socket.socket()
         sock.bind(('', 0))
         while sock.getsockname()[1] in _random_ports:
diff --git a/IPython/qt/console/ansi_code_processor.py b/IPython/qt/console/ansi_code_processor.py
@@ -368,7 +368,7 @@ def set_background_color(self, color):
         if color.value() >= 127:
             # Colors appropriate for a terminal with a light background. For
             # now, only use non-bright colors...
-            for i in xrange(8):
+            for i in range(8):
                 self.default_color_map[i + 8] = self.default_color_map[i]
 
             # ...and replace white with black.
diff --git a/IPython/utils/data.py b/IPython/utils/data.py
@@ -9,6 +9,8 @@
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
+from .py3compat import xrange
+
 def uniq_stable(elems):
     """uniq_stable(elems) -> list
 
diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
@@ -92,6 +92,7 @@ def isidentifier(s, dotted=False):
         return s.isidentifier()
     
     open = orig_open
+    xrange = range
     
     MethodType = types.MethodType
     
@@ -166,6 +167,8 @@ def __enter__(self):
         def __exit__(self, etype, value, traceback):
             self.f.close()
     
+    xrange = xrange
+
     def MethodType(func, instance):
         return types.MethodType(func, instance, type(instance))
     
diff --git a/IPython/utils/text.py b/IPython/utils/text.py
@@ -29,7 +29,6 @@
 from IPython.testing.skipdoctest import skip_doctest_py3, skip_doctest
 from IPython.utils import py3compat
 
-
 #-----------------------------------------------------------------------------
 # Declarations
 #-----------------------------------------------------------------------------
@@ -615,7 +614,7 @@ def parse(self, fmt_string):
 
 def _chunks(l, n):
     """Yield successive n-sized chunks from l."""
-    for i in xrange(0, len(l), n):
+    for i in py3compat.xrange(0, len(l), n):
         yield l[i:i+n]
 
 
diff --git a/IPython/utils/timing.py b/IPython/utils/timing.py
@@ -16,6 +16,8 @@
 
 import time
 
+from .py3compat import xrange
+
 #-----------------------------------------------------------------------------
 # Code
 #-----------------------------------------------------------------------------
