kallithea Changeset - 21f7b699d467

Changeset - 21f7b699d467

Parent rev.

Child rev.

[Not reviewed]

default

0 11 0

Mads Kiilerich - 6 years ago 2020-02-05 23:03:08
mads@kiilerich.com

py3: automatic migration with 2to3 -f xrange

11 files changed with 19 insertions and 19 deletions:

kallithea/lib/colored_formatter.py

kallithea/lib/helpers.py

kallithea/lib/timerproxy.py

kallithea/lib/vcs/utils/progressbar.py

kallithea/model/gist.py

kallithea/tests/other/test_vcs_operations.py

kallithea/tests/vcs/test_archives.py

kallithea/tests/vcs/test_changesets.py

kallithea/tests/vcs/test_getitem.py

kallithea/tests/vcs/test_getslice.py

kallithea/tests/vcs/test_inmemchangesets.py

0 comments (0 inline, 0 general)

kallithea/lib/colored_formatter.py

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
-BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = xrange(30, 38)
+BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(30, 38)
 # Sequences
 RESET_SEQ = "\033[0m"
 COLOR_SEQ = "\033[0;%dm"
 BOLD_SEQ = "\033[1m"

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -363,13 +363,13 @@ def gen_color(n=10000): @@
     :returns: RGB tuple
     """
     golden_ratio = 0.618033988749895
     h = 0.22717784590367374
-    for _unused in xrange(n):
+    for _unused in range(n):
         h += golden_ratio
         h %= 1
         HSV_tuple = [h, 0.95, 0.95]
         RGB_tuple = hsv_to_rgb(*HSV_tuple)
         yield [str(int(x * 256)) for x in RGB_tuple]

kallithea/lib/timerproxy.py

➞

Show inline comments

@@ @@ -17,13 +17,13 @@ import time @@
 from sqlalchemy.interfaces import ConnectionProxy
 log = logging.getLogger('timerproxy')
-BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = xrange(30, 38)
+BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(30, 38)
 def color_sql(sql):
     COLOR_SEQ = "\033[1;%dm"
     COLOR_SQL = YELLOW
     normal = '\x1b[0m'

kallithea/lib/vcs/utils/progressbar.py

➞

Show inline comments

@@ @@ -40,13 +40,13 @@ class ProgressBar(object): @@
     def __str__(self):
         return self.get_line()
     def __iter__(self):
         start = self.step
         end = self.steps + 1
-        for x in xrange(start, end):
+        for x in range(start, end):
             self.render(x)
             yield x
     def get_separator(self):
         return self.separator
@@ @@ -356,13 +356,13 @@ class BarOnlyColoredProgressBar(ColoredP @@
 def main():
     import time
     print("Standard progress bar...")
     bar = ProgressBar(30)
-    for x in xrange(1, 31):
+    for x in range(1, 31):
         bar.render(x)
         time.sleep(0.02)
     bar.stream.write('\n')
     print()
     print("Empty bar...")
@@ @@ -407,13 +407,13 @@ def main(): @@
     print("File transfer bar, breaks after 2 seconds ...")
     total_bytes = 1024 * 1024 * 2
     bar = ProgressBar(total_bytes)
     bar.width = 50
     bar.elements.remove('steps')
     bar.elements += ['transfer', 'time', 'eta', 'speed']
-    for x in xrange(0, bar.steps, 1024):
+    for x in range(0, bar.steps, 1024):
         bar.render(x)
         time.sleep(0.01)
         now = datetime.datetime.now()
         if now - bar.started >= datetime.timedelta(seconds=2):
             break
     print()

kallithea/model/gist.py

➞

Show inline comments

@@ @@ -47,13 +47,13 @@ GIST_METADATA_FILE = '.rc_gist_metadata' @@
 def make_gist_access_id():
     """Generate a random, URL safe, almost certainly unique gist identifier."""
     rnd = random.SystemRandom() # use cryptographically secure system PRNG
     alphabet = '23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjklmnpqrstuvwxyz'
     length = 20
-    return u''.join(rnd.choice(alphabet) for _ in xrange(length))
+    return u''.join(rnd.choice(alphabet) for _ in range(length))
 class GistModel(object):
     def __delete_gist(self, gist):
         """

kallithea/tests/other/test_vcs_operations.py

➞

Show inline comments

@@ @@ -184,13 +184,13 @@ def _add_files(vcs, dest_dir, files_no=3 @@
     email = 'me@example.com'
     if os.name == 'nt':
         author_str = 'User <%s>' % email
     else:
         author_str = 'User ǝɯɐᴎ <%s>' % email
-    for i in xrange(files_no):
+    for i in range(files_no):
         cmd = """echo "added_line%s" >> %s""" % (i, added_file)
         Command(dest_dir).execute(cmd)
         if vcs == 'hg':
             cmd = """hg commit -m "committed new %s" -u "%s" "%s" """ % (
                 i, author_str, added_file
+            )

kallithea/tests/vcs/test_archives.py

➞

Show inline comments

@@ @@ -15,13 +15,13 @@ from kallithea.tests.vcs.conf import TES @@
 class ArchivesTestCaseMixin(_BackendTestMixin):
     @classmethod
     def _get_commits(cls):
         start_date = datetime.datetime(2010, 1, 1, 20)
-        for x in xrange(5):
+        for x in range(5):
             yield {
                 'message': 'Commit %d' % x,
                 'author': 'Joe Doe <joe.doe@example.com>',
                 'date': start_date + datetime.timedelta(hours=12 * x),
                 'added': [
                     FileNode('%d/file_%d.txt' % (x, x),
@@ @@ -32,13 +32,13 @@ class ArchivesTestCaseMixin(_BackendTest @@
     def test_archive_zip(self):
         path = tempfile.mkstemp(dir=TESTS_TMP_PATH, prefix='test_archive_zip-')[1]
         with open(path, 'wb') as f:
             self.tip.fill_archive(stream=f, kind='zip', prefix='repo')
         out = zipfile.ZipFile(path)
-        for x in xrange(5):
+        for x in range(5):
             node_path = '%d/file_%d.txt' % (x, x)
             decompressed = out.read('repo/' + node_path)
             assert decompressed == self.tip.get_node(node_path).content
     def test_archive_tgz(self):
         path = tempfile.mkstemp(dir=TESTS_TMP_PATH, prefix='test_archive_tgz-')[1]
@@ @@ -46,26 +46,26 @@ class ArchivesTestCaseMixin(_BackendTest @@
             self.tip.fill_archive(stream=f, kind='tgz', prefix='repo')
         outdir = tempfile.mkdtemp(dir=TESTS_TMP_PATH, prefix='test_archive_tgz-', suffix='-outdir')
         outfile = tarfile.open(path, 'r|gz')
         outfile.extractall(outdir)
-        for x in xrange(5):
+        for x in range(5):
             node_path = '%d/file_%d.txt' % (x, x)
             assert open(os.path.join(outdir, 'repo/' + node_path), 'rb').read() == self.tip.get_node(node_path).content
     def test_archive_tbz2(self):
         path = tempfile.mkstemp(dir=TESTS_TMP_PATH, prefix='test_archive_tbz2-')[1]
         with open(path, 'w+b') as f:
             self.tip.fill_archive(stream=f, kind='tbz2', prefix='repo')
         outdir = tempfile.mkdtemp(dir=TESTS_TMP_PATH, prefix='test_archive_tbz2-', suffix='-outdir')
         outfile = tarfile.open(path, 'r|bz2')
         outfile.extractall(outdir)
-        for x in xrange(5):
+        for x in range(5):
             node_path = '%d/file_%d.txt' % (x, x)
             assert open(os.path.join(outdir, 'repo/' + node_path), 'rb').read() == self.tip.get_node(node_path).content
     def test_archive_default_stream(self):
         tmppath = tempfile.mkstemp(dir=TESTS_TMP_PATH, prefix='test_archive_default_stream-')[1]
         with open(tmppath, 'wb') as stream:

kallithea/tests/vcs/test_changesets.py

➞

Show inline comments

@@ @@ -42,13 +42,13 @@ class TestBaseChangeset(object): @@
 class _ChangesetsWithCommitsTestCaseixin(_BackendTestMixin):
     @classmethod
     def _get_commits(cls):
         start_date = datetime.datetime(2010, 1, 1, 20)
-        for x in xrange(5):
+        for x in range(5):
             yield {
                 'message': 'Commit %d' % x,
                 'author': 'Joe Doe <joe.doe@example.com>',
                 'date': start_date + datetime.timedelta(hours=12 * x),
                 'added': [
                     FileNode('file_%d.txt' % x, content='Foobar %d' % x),
@@ @@ -140,13 +140,13 @@ class _ChangesetsWithCommitsTestCaseixin @@
 class _ChangesetsTestCaseMixin(_BackendTestMixin):
     recreate_repo_per_test = False
     @classmethod
     def _get_commits(cls):
         start_date = datetime.datetime(2010, 1, 1, 20)
-        for x in xrange(5):
+        for x in range(5):
             yield {
                 'message': u'Commit %d' % x,
                 'author': u'Joe Doe <joe.doe@example.com>',
                 'date': start_date + datetime.timedelta(hours=12 * x),
                 'added': [
                     FileNode('file_%d.txt' % x, content='Foobar %d' % x),
@@ @@ -235,13 +235,13 @@ class _ChangesetsTestCaseMixin(_BackendT @@
             self.repo.get_changesets(reverse=True)]
         assert changesets_id_list == list(reversed(self.repo.revisions))
     def test_get_filenodes_generator(self):
         tip = self.repo.get_changeset()
         filepaths = [node.path for node in tip.get_filenodes_generator()]
-        assert filepaths == ['file_%d.txt' % x for x in xrange(5)]
+        assert filepaths == ['file_%d.txt' % x for x in range(5)]
     def test_size(self):
         tip = self.repo.get_changeset()
         size = 5 * len('Foobar N') # Size of 5 files
         assert tip.size == size

kallithea/tests/vcs/test_getitem.py

➞

Show inline comments

@@ @@ -6,13 +6,13 @@ from kallithea.tests.vcs.base import _Ba @@
 class GetitemTestCaseMixin(_BackendTestMixin):
     @classmethod
     def _get_commits(cls):
         start_date = datetime.datetime(2010, 1, 1, 20)
-        for x in xrange(5):
+        for x in range(5):
             yield {
                 'message': 'Commit %d' % x,
                 'author': 'Joe Doe <joe.doe@example.com>',
                 'date': start_date + datetime.timedelta(hours=12 * x),
                 'added': [
                     FileNode('file_%d.txt' % x, content='Foobar %d' % x),
@@ @@ -20,13 +20,13 @@ class GetitemTestCaseMixin(_BackendTestM @@
+            }
     def test__getitem__last_item_is_tip(self):
         assert self.repo[-1] == self.repo.get_changeset()
     def test__getitem__returns_correct_items(self):
-        changesets = [self.repo[x] for x in xrange(len(self.repo.revisions))]
+        changesets = [self.repo[x] for x in range(len(self.repo.revisions))]
         assert changesets == list(self.repo.get_changesets())
 class TestGitGetitem(GetitemTestCaseMixin):
     backend_alias = 'git'

kallithea/tests/vcs/test_getslice.py

➞

Show inline comments

@@ @@ -6,13 +6,13 @@ from kallithea.tests.vcs.base import _Ba @@
 class GetsliceTestCaseMixin(_BackendTestMixin):
     @classmethod
     def _get_commits(cls):
         start_date = datetime.datetime(2010, 1, 1, 20)
-        for x in xrange(5):
+        for x in range(5):
             yield {
                 'message': 'Commit %d' % x,
                 'author': 'Joe Doe <joe.doe@example.com>',
                 'date': start_date + datetime.timedelta(hours=12 * x),
                 'added': [
                     FileNode('file_%d.txt' % x, content='Foobar %d' % x),

kallithea/tests/vcs/test_inmemchangesets.py

➞

Show inline comments

@@ @@ -297,13 +297,13 @@ class InMemoryChangesetTestMixin(_Backen @@
             self.imc.removed
         ))
     def test_multiple_commits(self):
         N = 3  # number of commits to perform
         last = None
-        for x in xrange(N):
+        for x in range(N):
             fname = 'file%s' % str(x).rjust(5, '0')
             content = 'foobar\n' * x
             node = FileNode(fname, content=content)
             self.imc.add(node)
             commit = self.imc.commit(u"Commit no. %s" % (x + 1), author=u'vcs')
             assert last != commit

0 comments (0 inline, 0 general)