Consistently use the generator version of range

That way we get the same behavior on python2 and python3.

10 files changed, 19 insertions, 0 deletions

diff --git a/__init__.py b/__init__.py
index 8d063e2..7b06bb1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -25,6 +25,9 @@
 :var IGNORED_EXTENSIONS: file extensions that may usually be ignored
 """
 __docformat__ = "restructuredtext en"
+
+from six.moves import range
+
 from logilab.common.__pkginfo__ import version as __version__
 
 STD_BLACKLIST = ('CVS', '.svn', '.hg', 'debian', 'dist', 'build')
diff --git a/configuration.py b/configuration.py
index 77a636f..58746b0 100644
--- a/configuration.py
+++ b/configuration.py
@@ -124,6 +124,7 @@ from ConfigParser import ConfigParser
 from warnings import warn
 
 from six import string_types
+from six.moves import range
 
 from logilab.common.compat import raw_input, str_encode as _encode
 from logilab.common.deprecation import deprecated
diff --git a/daemon.py b/daemon.py
index f9f4971..6324b20 100644
--- a/daemon.py
+++ b/daemon.py
@@ -26,6 +26,8 @@ import sys
 import time
 import warnings
 
+from six.moves import range
+
 def setugid(user):
     """Change process user and group ID
 
diff --git a/dbf.py b/dbf.py
index 3396383..bb1b9e6 100644
--- a/dbf.py
+++ b/dbf.py
@@ -37,6 +37,8 @@ import sys
 import csv
 import tempfile
 
+from six.moves import range
+
 class Dbase:
     def __init__(self):
         self.fdb = None
diff --git a/modutils.py b/modutils.py
index 1ccf09e..bff0c91 100644
--- a/modutils.py
+++ b/modutils.py
@@ -37,6 +37,8 @@ from imp import find_module, load_module, C_BUILTIN, PY_COMPILED, PKG_DIRECTORY
 from distutils.sysconfig import get_config_var, get_python_lib, get_python_version
 from distutils.errors import DistutilsPlatformError
 
+from six.moves import range
+
 try:
     import zipimport
 except ImportError:
diff --git a/table.py b/table.py
index 122e368..2f3df69 100644
--- a/table.py
+++ b/table.py
@@ -21,6 +21,7 @@ from __future__ import print_function
 
 __docformat__ = "restructuredtext en"
 
+from six.moves import range
 
 class Table(object):
     """Table defines a data table with column and row names.
diff --git a/test/unittest_table.py b/test/unittest_table.py
index 49dbf10..362e8ce 100644
--- a/test/unittest_table.py
+++ b/test/unittest_table.py
@@ -24,6 +24,8 @@ import sys
 import os
 from cStringIO import StringIO
 
+from six.moves import range
+
 from logilab.common.testlib import TestCase, unittest_main
 from logilab.common.table import Table, TableStyleSheet, DocbookTableWriter, \
      DocbookRenderer, TableStyle, TableWriter, TableCellRenderer
diff --git a/ureports/docbook_writer.py b/ureports/docbook_writer.py
index a520364..857068c 100644
--- a/ureports/docbook_writer.py
+++ b/ureports/docbook_writer.py
@@ -18,6 +18,8 @@
 """HTML formatting drivers for ureports"""
 __docformat__ = "restructuredtext en"
 
+from six.moves import range
+
 from logilab.common.ureports import HTMLWriter
 
 class DocbookWriter(HTMLWriter):
diff --git a/ureports/html_writer.py b/ureports/html_writer.py
index 1d09503..faca90b 100644
--- a/ureports/html_writer.py
+++ b/ureports/html_writer.py
@@ -20,6 +20,8 @@ __docformat__ = "restructuredtext en"
 
 from cgi import escape
 
+from six.moves import range
+
 from logilab.common.ureports import BaseWriter
 
 
diff --git a/ureports/text_writer.py b/ureports/text_writer.py
index 88a046a..a25cf26 100644
--- a/ureports/text_writer.py
+++ b/ureports/text_writer.py
@@ -21,6 +21,8 @@ from __future__ import print_function
 
 __docformat__ = "restructuredtext en"
 
+from six.moves import range
+
 from logilab.common.textutils import linesep
 from logilab.common.ureports import BaseWriter