python-modernize -f libmodernize.fixes.fix_xrange_six

cli/koji_cli/commands.py

@@ -23,6 +23,7 @@ import six.moves.xmlrpc_client
 from six.moves import filter
 from six.moves import map
 from six.moves import zip
+from six.moves import range
 
 try:
     import libcomps

hub/kojihub.py

@@ -22,6 +22,7 @@
 #       Mike Bonnet <mikeb@redhat.com>
 #       Cristian Balint <cbalint@redhat.com>
 
+from __future__ import absolute_import
 import base64
 import calendar
 import koji.rpmdiff
@@ -61,6 +62,7 @@ from koji.util import md5_constructor
 from koji.util import multi_fnmatch
 from koji.util import safer_move
 from koji.util import sha1_constructor
+from six.moves import range
 logger = logging.getLogger('koji.hub')
 
 def log_error(msg):

hub/kojixmlrpc.py

@@ -18,6 +18,7 @@
 # Authors:
 #       Mike McLean <mikem@redhat.com>
 
+from __future__ import absolute_import
 from ConfigParser import RawConfigParser
 import datetime
 import inspect
@@ -38,6 +39,7 @@ import koji.util
 # import xmlrpclib functions from koji to use tweaked Marshaller
 from koji.xmlrpcplus import getparser, dumps, Fault, ExtendedMarshaller
 from koji.context import context
+from six.moves import range
 
 
 class Marshaller(ExtendedMarshaller):

koji/context.py

@@ -24,7 +24,9 @@
 #    - request data
 #    - auth data
 
+from __future__ import absolute_import
 import thread
+from six.moves import range
 
 class _data(object):
     pass
@@ -97,7 +99,7 @@ if __name__ == '__main__':
         context._threadclear()
         print(context)
 
-    for x in xrange(1, 10):
+    for x in range(1, 10):
         thread.start_new_thread(test, ())
 
     time.sleep(4)

koji/daemon.py

@@ -20,6 +20,7 @@
 #       Mike McLean <mikem@redhat.com>
 #       Mike Bonnet <mikeb@redhat.com>
 
+from __future__ import absolute_import
 import koji
 import koji.tasks
 import koji.xmlrpcplus
@@ -36,6 +37,7 @@ import subprocess
 import sys
 import traceback
 import errno
+from six.moves import range
 
 
 def incremental_upload(session, fname, fd, path, retries=5, logger=None):
@@ -719,7 +721,7 @@ class TaskManager(object):
             fo = open(fn, 'r')
             id = None
             name = None
-            for n in xrange(10):
+            for n in range(10):
                 # data should be in first few lines
                 line = fo.readline()
                 if line.startswith('# Koji buildroot id:'):

koji/tasks.py

@@ -20,6 +20,7 @@
 #       Mike McLean <mikem@redhat.com>
 #       Mike Bonnet <mikeb@redhat.com>
 
+from __future__ import absolute_import
 import koji
 import koji.plugin
 import koji.util
@@ -32,6 +33,7 @@ import random
 import time
 import pprint
 import six.moves.urllib.request
+from six.moves import range
 
 def scan_mounts(topdir):
     """Search path for mountpoints"""
@@ -577,7 +579,7 @@ class SleepTask(BaseTaskHandler):
 class ForkTask(BaseTaskHandler):
     Methods = ['fork']
     def handler(self, n=5, m=37):
-        for i in xrange(n):
+        for i in range(n):
             os.spawnvp(os.P_NOWAIT, 'sleep', ['sleep', str(m)])
 
 class WaitTestTask(BaseTaskHandler):
@@ -592,7 +594,7 @@ class WaitTestTask(BaseTaskHandler):
     _taskWeight = 0.1
     def handler(self, count, seconds=10):
         tasks = []
-        for i in xrange(count):
+        for i in range(count):
             task_id = self.subtask(method='sleep', arglist=[seconds], label=str(i))
             tasks.append(task_id)
         bad_task = self.subtask('sleep', ['BAD_ARG'], label='bad')

tests/test_cli/test_import_sig.py

@@ -5,6 +5,7 @@ import hashlib
 import mock
 import random
 import six
+from six.moves import range
 try:
     import unittest2 as unittest
 except ImportError:

tests/test_lib/test_plugin.py

@@ -1,6 +1,8 @@
+from __future__ import absolute_import
 import copy
 import datetime
 import mock
+from six.moves import range
 try:
     import unittest2 as unittest
 except ImportError:

tests/test_lib/test_xmlrpcplus.py

@@ -1,4 +1,6 @@
 # coding=utf-8
+from __future__ import absolute_import
+from six.moves import range
 try:
     import unittest2 as unittest
 except ImportError:

tests/test_lib_py2only/test_tasks.py

@@ -2,6 +2,7 @@ from __future__ import absolute_import
 import random
 import shutil
 import six
+from six.moves import range
 try:
     import unittest2 as unittest
 except ImportError:

util/koji-shadow

@@ -22,6 +22,8 @@
 #       Dennis Gilmore <dennis@ausil.us>
 #       Karsten Hopp <karsten@redhat.com>
 
+from __future__ import absolute_import
+from six.moves import range
 try:
     import krbV
 except ImportError:  # pragma: no cover
@@ -861,7 +863,7 @@ class BuildTracker(object):
         taginfo = remote.getTag(tag)
         builds = remote.listTagged(taginfo['id'], latest=True)
         for build in builds:
-            for retry in xrange(10):
+            for retry in range(10):
                 try:
                     self.scanBuild(build['id'], tag=tag)
                     if options.first_one:

www/kojiweb/index.py

@@ -20,6 +20,7 @@
 #       Mike Bonnet <mikeb@redhat.com>
 #       Mike McLean <mikem@redhat.com>
 
+from __future__ import absolute_import
 import os
 import os.path
 import re
@@ -36,6 +37,7 @@ from kojiweb.util import _initValues
 from kojiweb.util import _genHTML
 from kojiweb.util import _getValidTokens
 from koji.util import sha1_constructor
+from six.moves import range
 
 # Convenience definition of a commonly-used sort function
 _sortbyname = kojiweb.util.sortByKeyFunc('name')
@@ -809,7 +811,7 @@ def tags(environ, start=None, order=None, childID=None):
 
     return _genHTML(environ, 'tags.chtml')
 
-_PREFIX_CHARS = [chr(char) for char in range(48, 58) + range(97, 123)]
+_PREFIX_CHARS = [chr(char) for char in list(range(48, 58)) + list(range(97, 123))]
 
 def packages(environ, tagID=None, userID=None, order='package_name', start=None, prefix=None, inherited='1'):
     values = _initValues(environ, 'Packages', 'packages')

www/lib/kojiweb/util.py

@@ -20,6 +20,7 @@
 #       Mike Bonnet <mikeb@redhat.com>
 #       Mike McLean <mikem@redhat.com>
 
+from __future__ import absolute_import
 import Cheetah.Template
 import datetime
 import koji
@@ -32,6 +33,7 @@ from socket import sslerror as socket_sslerror
 from xmlrpclib import ProtocolError
 from xml.parsers.expat import ExpatError
 import cgi
+from six.moves import range
 
 class NoSuchException(Exception):
     pass