PR#2490: Drop py 2.6 support (RHEL6) - koji

		`@@ -3,7 +3,6 @@`
		`BINFILES = kojid`
		`LIBEXECFILES = mergerepos`
		`SYSTEMDSYSTEMUNITDIR = $(shell pkg-config systemd --variable=systemdsystemunitdir)`
		`- TYPE = systemd`

		`_default:`
		`@echo "nothing to make. try make install"`
		`@@ -33,15 +32,6 @@`
		`mkdir -p $(DESTDIR)/etc/kojid`
		`install -p -m 644 kojid.conf $(DESTDIR)/etc/kojid/kojid.conf`

		`- install-systemd: _install`
		`+ install: _install`
		`mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)`
		`install -p -m 644 kojid.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)`
		`-`
		`- install-sysv: _install`
		`- mkdir -p $(DESTDIR)/etc/rc.d/init.d`
		`- install -p -m 755 kojid.init $(DESTDIR)/etc/rc.d/init.d/kojid`
		`-`
		`- mkdir -p $(DESTDIR)/etc/sysconfig`
		`- install -p -m 644 kojid.sysconfig $(DESTDIR)/etc/sysconfig/kojid`
		`-`
		`- install: install-$(TYPE)`

builder/kojid

file modified

+35 -206

		`@@ -26,6 +26,7 @@`
		`import copy`
		`import glob`
		`import grp`
		`+ import io`
		`import json`
		`import logging`
		`import logging.handlers`
		`@@ -48,6 +49,8 @@`
		`from optparse import SUPPRESS_HELP, OptionParser`

		`import Cheetah.Template`
		`+ import dnf`
		`+ import librepo`
		`import requests`
		`import rpm`
		`import six`
		`@@ -79,26 +82,6 @@`
		`except ImportError: # pragma: no cover`
		`reqgssapi = None`

		`- try:`
		`- import librepo`
		`- import io`
		`- except ImportError:`
		`- librepo = None`
		`-`
		`- try:`
		`- import dnf`
		`- except ImportError:`
		`- dnf = None`
		`-`
		`- try:`
		`- # yum`
		`- from yum import repoMDObject`
		`- import yum.packages`
		`- import yum.Errors`
		`- yum_available = True`
		`- except ImportError:`
		`- yum_available = False`
		`-`
		`# imports for LiveCD, LiveMedia, and Appliance handler`
		`try:`
		`import pykickstart.parser as ksparser`
		`@@ -803,60 +786,42 @@`
		`opts = dict([(k, getattr(self.options, k)) for k in ('topurl', 'topdir')])`
		`opts['tempdir'] = self.options.workdir`

		`- # prefer librepo`
		`- if librepo is not None:`
		`- repo_url = os.path.join(repodir, self.br_arch)`
		`- # repo_url can start with '/', don't use os.path.join`
		`- if self.options.topurl:`
		`- repo_url = '%s/%s' % (self.options.topurl, repo_url)`
		`- elif self.options.topdir:`
		`- repo_url = '%s/%s' % (self.options.topdir, repo_url)`
		`- logging.error(repo_url)`
		`- tmpdir = os.path.join(self.tmpdir(), 'librepo-markExternalRPMs')`
		`- koji.ensuredir(tmpdir)`
		`- h = librepo.Handle()`
		`- r = librepo.Result()`
		`- h.setopt(librepo.LRO_REPOTYPE, librepo.LR_YUMREPO)`
		`- h.setopt(librepo.LRO_URLS, [repo_url])`
		`- h.setopt(librepo.LRO_DESTDIR, tmpdir)`
		`- # We are using this just to find out location of 'origin',`
		`- # we don't even need to download it since we use openRemoteFile`
		`- h.setopt(librepo.LRO_YUMDLIST, [])`
		`- h.perform(r)`
		`- pkgorigins = r.getinfo(librepo.LRR_YUM_REPOMD)['origin']['location_href']`
		`- koji.util.rmtree(tmpdir)`
		`- elif yum_available:`
		`- # XXX - cheap hack to get relative paths`
		`- repomdpath = os.path.join(repodir, self.br_arch, 'repodata', 'repomd.xml')`
		`- with koji.openRemoteFile(repomdpath, **opts) as fo:`
		`- try:`
		`- repodata = repoMDObject.RepoMD('ourrepo', fo)`
		`- except Exception:`
		`- raise koji.BuildError("Unable to parse repomd.xml file for %s" %`
		`- os.path.join(repodir, self.br_arch))`
		`- data = repodata.getData('origin')`
		`- pkgorigins = data.location[1]`
		`- else:`
		`- # shouldn't occur`
		`- raise koji.GenericError("install librepo or yum")`
		`+ repo_url = os.path.join(repodir, self.br_arch)`
		`+ # repo_url can start with '/', don't use os.path.join`
		`+ if self.options.topurl:`
		`+ repo_url = '%s/%s' % (self.options.topurl, repo_url)`
		`+ elif self.options.topdir:`
		`+ repo_url = '%s/%s' % (self.options.topdir, repo_url)`
		`+ logging.error(repo_url)`
		`+ tmpdir = os.path.join(self.tmpdir(), 'librepo-markExternalRPMs')`
		`+ koji.ensuredir(tmpdir)`
		`+ h = librepo.Handle()`
		`+ r = librepo.Result()`
		`+ h.setopt(librepo.LRO_REPOTYPE, librepo.LR_YUMREPO)`
		`+ h.setopt(librepo.LRO_URLS, [repo_url])`
		`+ h.setopt(librepo.LRO_DESTDIR, tmpdir)`
		`+ # We are using this just to find out location of 'origin',`
		`+ # we don't even need to download it since we use openRemoteFile`
		`+ h.setopt(librepo.LRO_YUMDLIST, [])`
		`+ h.perform(r)`
		`+ pkgorigins = r.getinfo(librepo.LRR_YUM_REPOMD)['origin']['location_href']`
		`+ koji.util.rmtree(tmpdir)`

		`relpath = os.path.join(repodir, self.br_arch, pkgorigins)`
		`with koji.openRemoteFile(relpath, **opts) as fo:`
		`# at this point we know there were external repos at the create event,`
		`# so there should be an origins file.`
		`origin_idx = {}`
		`- # don't use 'with GzipFile' as it is not supported on py2.6`
		`- fo2 = GzipFile(fileobj=fo, mode='r')`
		`- if six.PY3:`
		`- fo2 = io.TextIOWrapper(fo2, encoding='utf-8')`
		`- for line in fo2:`
		`- parts = line.split(None, 2)`
		`- if len(parts) < 2:`
		`- continue`
		`- # first field is formated by yum as [e:]n-v-r.a`
		`- nvra = "%(name)s-%(version)s-%(release)s.%(arch)s" % koji.parse_NVRA(parts[0])`
		`- origin_idx[nvra] = parts[1]`
		`- fo2.close()`
		`+ with GzipFile(fileobj=fo, mode='r') as fo2:`
		`+ if six.PY3:`
		`+ fo2 = io.TextIOWrapper(fo2, encoding='utf-8')`
		`+ for line in fo2:`
		`+ parts = line.split(None, 2)`
		`+ if len(parts) < 2:`
		`+ continue`
		`+ # first field is formated by yum as [e:]n-v-r.a`
		`+ nvra = "%(name)s-%(version)s-%(release)s.%(arch)s" % koji.parse_NVRA(parts[0])`
		`+ origin_idx[nvra] = parts[1]`
		`# mergerepo starts from a local repo in the task workdir, so internal`
		`# rpms have an odd-looking origin that we need to look for`
		`localtail = '/repo_%s_premerge/' % self.repo_info['id']`
		`@@ -5756,10 +5721,7 @@`
		`self.uploadpath = self.getUploadDir()`
		`self.get_rpms(tag, arch, keys, opts)`
		`if opts['multilib'] and koji.arch.isMultiLibArch(arch):`
		`- if dnf is not None:`
		`- self.do_multilib_dnf(arch, self.archmap[arch], opts['multilib'])`
		`- else:`
		`- self.do_multilib_yum(arch, self.archmap[arch], opts['multilib'])`
		`+ self.do_multilib(arch, self.archmap[arch], opts['multilib'])`
		`self.split_pkgs(opts)`
		`self.write_kojipkgs()`
		`self.write_pkglist()`
		`@@ -5886,7 +5848,7 @@`
		`raise koji.GenericError('failed to create repo: %s'`
		`% parseStatus(status, ' '.join(cmd)))`

		`- def do_multilib_dnf(self, arch, ml_arch, conf):`
		`+ def do_multilib(self, arch, ml_arch, conf):`
		`repodir = koji.pathinfo.distrepo(self.rinfo['id'], self.rinfo['tag_name'])`
		`mldir = os.path.join(repodir, koji.canonArch(ml_arch))`
		`ml_true = set() # multilib packages we need to include before depsolve`
		`@@ -6012,139 +5974,6 @@`
		`rpminfo['_multilib'] = True`
		`self.kojipkgs[bnp] = rpminfo`

		`- def do_multilib_yum(self, arch, ml_arch, conf):`
		`- repodir = koji.pathinfo.distrepo(self.rinfo['id'], self.rinfo['tag_name'])`
		`- mldir = os.path.join(repodir, koji.canonArch(ml_arch))`
		`- ml_true = set() # multilib packages we need to include before depsolve`
		`- ml_conf = os.path.join(koji.pathinfo.work(), conf)`
		`-`
		`- # read pkgs data from multilib repo`
		`- ml_pkgfile = os.path.join(mldir, 'kojipkgs')`
		`- ml_pkgs = json.load(open(ml_pkgfile, 'r'))`
		`-`
		`- # step 1: figure out which packages are multilib (should already exist)`
		`- mlm = multilib.DevelMultilibMethod(ml_conf)`
		`- fs_missing = set()`
		`- for bnp in self.kojipkgs:`
		`- rpminfo = self.kojipkgs[bnp]`
		`- ppath = rpminfo['_pkgpath']`
		`- po = yum.packages.YumLocalPackage(filename=ppath)`
		`- if mlm.select(po):`
		`- # we need a multilib package to be included`
		`- ml_bnp = bnp.replace(arch, self.archmap[arch])`
		`- ml_path = os.path.join(mldir, ml_bnp[0].lower(), ml_bnp)`
		`- # ^ XXX - should actually generate this`
		`- if ml_bnp not in ml_pkgs:`
		`- # not in our multilib repo`
		`- self.logger.error('%s (multilib) is not on the filesystem' % ml_path)`
		`- fs_missing.add(ml_path)`
		`- # we defer failure so can report all the missing deps`
		`- continue`
		`- ml_true.add(ml_path)`
		`-`
		`- # step 2: set up architectures for yum configuration`
		`- self.logger.info("Resolving multilib for %s using method devel" % arch)`
		`- yumbase = yum.YumBase()`
		`- yumbase.verbose_logger.setLevel(logging.ERROR)`
		`- yumdir = os.path.join(self.workdir, 'yum')`
		`- # TODO: unwind this arch mess`
		`- archlist = (arch, 'noarch')`
		`- transaction_arch = arch`
		`- archlist = archlist + self.compat[self.biarch[arch]]`
		`- best_compat = self.compat[self.biarch[arch]][0]`
		`- if koji.arch.archDifference(best_compat, arch) > 0:`
		`- transaction_arch = best_compat`
		`- if hasattr(koji.arch, 'ArchStorage'):`
		`- yumbase.preconf.arch = transaction_arch`
		`- else:`
		`- koji.arch.canonArch = transaction_arch`
		`-`
		`- yconfig = """`
		`- [main]`
		`- debuglevel=2`
		`- pkgpolicy=newest`
		`- exactarch=1`
		`- gpgcheck=0`
		`- reposdir=/dev/null`
		`- cachedir=/yumcache`
		`- installroot=%s`
		`- logfile=/yum.log`
		`-`
		`- [koji-%s]`
		`- name=koji multilib task`
		`- baseurl=file://%s`
		`- enabled=1`
		`-`
		`- """ % (yumdir, self.id, mldir)`
		`- os.makedirs(os.path.join(yumdir, "yumcache"))`
		`- os.makedirs(os.path.join(yumdir, 'var/lib/rpm'))`
		`-`
		`- # step 3: proceed with yum config and set up`
		`- yconfig_path = os.path.join(yumdir, 'yum.conf-koji-%s' % arch)`
		`- with open(yconfig_path, 'w') as f:`
		`- f.write(yconfig)`
		`- self.session.uploadWrapper(yconfig_path, self.uploadpath,`
		`- os.path.basename(yconfig_path))`
		`- yumbase.doConfigSetup(fn=yconfig_path)`
		`- yumbase.conf.cache = 0`
		`- yumbase.doRepoSetup()`
		`- yumbase.doTsSetup()`
		`- yumbase.doRpmDBSetup()`
		`- # we trust Koji's files, so skip verifying sigs and digests`
		`- yumbase.ts.pushVSFlags(`
		`- (rpm._RPMVSF_NOSIGNATURES \| rpm._RPMVSF_NODIGESTS))`
		`- yumbase.doSackSetup(archlist=archlist, thisrepo='koji-%s' % arch)`
		`- yumbase.doSackFilelistPopulate()`
		`- for pkg in ml_true:`
		`- # TODO: store packages by first letter`
		`- # ppath = os.path.join(pkgdir, pkg.name[0].lower(), pname)`
		`- po = yum.packages.YumLocalPackage(filename=pkg)`
		`- yumbase.tsInfo.addInstall(po)`
		`-`
		`- # step 4: execute yum transaction to get dependencies`
		`- self.logger.info("Resolving depenencies for arch %s" % arch)`
		`- rc, errors = yumbase.resolveDeps()`
		`- ml_needed = {}`
		`- for tspkg in yumbase.tsInfo.getMembers():`
		`- bnp = os.path.basename(tspkg.po.localPkg())`
		`- dep_path = os.path.join(mldir, bnp[0].lower(), bnp)`
		`- ml_needed[dep_path] = tspkg`
		`- self.logger.debug("added %s" % dep_path)`
		`- if not os.path.exists(dep_path):`
		`- self.logger.error('%s (multilib dep) not on filesystem' % dep_path)`
		`- fs_missing.add(dep_path)`
		`- self.logger.info('yum return code: %s' % rc)`
		`- if not rc:`
		`- self.logger.error('yum depsolve was unsuccessful')`
		`- raise koji.GenericError(errors)`
		`- if len(fs_missing) > 0:`
		`- missing_log = os.path.join(self.workdir, 'missing_multilib.log')`
		`- with open(missing_log, 'w') as outfile:`
		`- outfile.write('The following multilib files were missing:\n')`
		`- for ml_path in fs_missing:`
		`- outfile.write(ml_path)`
		`- outfile.write('\n')`
		`- self.session.uploadWrapper(missing_log, self.uploadpath)`
		`- raise koji.GenericError('multilib packages missing. '`
		`- 'See missing_multilib.log')`
		`-`
		`- # step 5: update kojipkgs`
		`- for dep_path in ml_needed:`
		`- tspkg = ml_needed[dep_path]`
		`- bnp = os.path.basename(dep_path)`
		`- if bnp in self.kojipkgs:`
		`- # we expect duplication with noarch, but not other arches`
		`- if tspkg.arch != 'noarch':`
		`- self.logger.warning("Multilib duplicate: %s", bnp)`
		`- continue`
		`- rpminfo = ml_pkgs[bnp].copy()`
		`- # fix _pkgpath, which comes from another task and could be wrong`
		`- # for us`
		`- # TODO: would be better if we could use the proper path here`
		`- rpminfo['_pkgpath'] = dep_path`
		`- rpminfo['_multilib'] = True`
		`- self.kojipkgs[bnp] = rpminfo`
		`-`
		`def pick_key(self, keys, avail_keys):`
		`best = None`
		`best_idx = None`

devtools/fakehub

file modified

+4 -4

		`@@ -1,15 +1,15 @@`
		`- #!/usr/bin/python2`
		`+ #!/usr/bin/python3`

		`from __future__ import absolute_import, print_function`

		`import ast`
		`+ import io`
		`import os`
		`import os.path`
		`import pprint`
		`import sys`

		`- from six.moves import cStringIO`
		`- from six.moves.urllib.parse import quote`
		`+ from urllib.parse import quote`

		`sys.path.insert(0, os.getcwd())`
		`sys.path.insert(1, os.path.join(os.getcwd(), 'hub'))`
		`@@ -94,7 +94,7 @@`
		`environ['SERVER_NAME'] = 'myserver'`
		`environ['SERVER_PORT'] = '443'`
		`environ['REQUEST_URI'] = get_url(environ)`
		`- environ['wsgi.input'] = cStringIO(get_request())`
		`+ environ['wsgi.input'] = io.StringIO(get_request())`
		`environ['REQUEST_METHOD'] = 'POST'`
		`environ['CONTENT_TYPE'] = 'text/xml'`
		`set_config(environ)`

devtools/fakeweb

file modified

+2 -2

		`@@ -1,4 +1,4 @@`
		`- #!/usr/bin/python2`
		`+ #!/usr/bin/python3`

		`from __future__ import absolute_import, print_function`

		`@@ -7,10 +7,10 @@`
		`import os.path`
		`import pprint`
		`import sys`
		`+ from urllib.parse import quote`
		`from wsgiref.simple_server import make_server`
		`from wsgiref.util import setup_testing_defaults`

		`- from six.moves.urllib.parse import quote`

		`CWD = os.getcwd()`
		`sys.path.insert(0, CWD)`

docs/source/server_howto.rst

file modified

+3 -3

		`@@ -548,9 +548,9 @@`
		`handling is done by cron, but can be substituted by anything else (Ansible`
		`tower, etc.)`

		- Script is by default installed on hub as `/usr/sbin/koji-sweep-db`. On systemd
		- systems it also has corresponding `koji-sweep-db` service and timer. Note, that
		- timer is not enabled by default, so you need to run usual `systemctl` commands:
		+ Script is by default installed on hub as `/usr/sbin/koji-sweep-db`. It has also
		+ corresponding `koji-sweep-db` service and timer. Note, that timer is not enabled
		+ by default, so you need to run usual `systemctl` commands:

		`::`

koji.spec

file modified

+9 -85

		`@@ -18,9 +18,13 @@`
		`# and no python2 on rhel8+`
		`%define py2_support 0`
		`%else`
		`- %if 0%{?rhel}`
		`+ %if 0%{?rhel} >= 7`
		`# No python3 for older rhel`
		`%define py3_support 0`
		`+ %else`
		`+ # don't build anything for rhel6`
		`+ %define py2_support 0`
		`+ %define py3_support 0`
		`%endif`
		`%endif`

		`@@ -66,13 +70,6 @@`
		`# If the definition isn't available for python3_pkgversion, define it`
		`%{?!python3_pkgversion:%global python3_pkgversion 3}`

		`- %if 0%{?fedora} \|\| 0%{?rhel} >= 7`
		`- %global use_systemd 1`
		`- %else`
		`- %global use_systemd 0`
		`- %global install_opt TYPE=sysv`
		`- %endif`
		`-`
		`%define baserelease 1`
		`#build with --define 'testbuild 1' to have a timestamp appended to release`
		`%if "x%{?testbuild}" == "x1"`
		`@@ -100,10 +97,8 @@`
		`Requires: python-libcomps`
		`%endif`
		`%endif`
		`- %if %{use_systemd}`
		`BuildRequires: systemd`
		`BuildRequires: pkgconfig`
		`- %endif`

		`%description`
		`Koji is a system for building and tracking RPMS. The base package`
		`@@ -261,16 +256,9 @@`
		`Requires: mock >= 0.9.14`
		`Requires(pre): /usr/sbin/useradd`
		`Requires: squashfs-tools`
		`- %if %{use_systemd}`
		`Requires(post): systemd`
		`Requires(preun): systemd`
		`Requires(postun): systemd`
		`- %else`
		`- Requires(post): /sbin/chkconfig`
		`- Requires(post): /sbin/service`
		`- Requires(preun): /sbin/chkconfig`
		`- Requires(preun): /sbin/service`
		`- %endif`
		`Requires: /usr/bin/cvs`
		`Requires: /usr/bin/svn`
		`Requires: /usr/bin/git`
		`@@ -295,16 +283,9 @@`
		`Group: Applications/System`
		`License: LGPLv2`
		`Requires: %{name} = %{version}-%{release}`
		`- %if %{use_systemd}`
		`Requires(post): systemd`
		`Requires(preun): systemd`
		`Requires(postun): systemd`
		`- %else`
		`- Requires(post): /sbin/chkconfig`
		`- Requires(post): /sbin/service`
		`- Requires(preun): /sbin/chkconfig`
		`- Requires(preun): /sbin/service`
		`- %endif`
		`%if 0%{py3_support} > 1`
		`Requires: python%{python3_pkgversion}-libvirt`
		`Requires: python%{python3_pkgversion}-libxml2`
		`@@ -333,11 +314,9 @@`
		`Obsoletes: python2-koji-sidetag-plugin-tools < %{version}-%{release}`
		`Provides: python2-koji-sidetag-plugin-tools = %{version}-%{release}`
		`%endif`
		`- %if %{use_systemd}`
		`Requires(post): systemd`
		`Requires(preun): systemd`
		`Requires(postun): systemd`
		`- %endif`

		`%description utils`
		`Utilities for the Koji system`
		`@@ -388,12 +367,12 @@`

		`# python2 build`
		`%if 0%{py2_support} > 1`
		`- make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python2} %{?install_opt} install`
		`+ make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python2} install`
		`%else`
		`%if 0%{py2_support}`
		`for d in koji cli plugins ; do`
		`pushd $d`
		`- make DESTDIR=$RPM_BUILD_ROOT KOJI_MINIMAL=1 PYTHON=%{__python2} %{?install_opt} install`
		`+ make DESTDIR=$RPM_BUILD_ROOT KOJI_MINIMAL=1 PYTHON=%{__python2} install`
		`popd`
		`done`
		`%endif`
		`@@ -402,7 +381,7 @@`

		`# python3 build`
		`%if 0%{py3_support} > 1`
		`- make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3} %{?install_opt} install`
		`+ make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3} install`
		`# alter python interpreter in koji CLI`
		`scripts='%{_bindir}/koji %{_sbindir}/kojid %{_sbindir}/kojira %{_sbindir}/koji-shadow`
		`%{_sbindir}/koji-gc %{_sbindir}/kojivmd %{_sbindir}/koji-sweep-db`
		`@@ -415,7 +394,7 @@`
		`# minimal`
		`for d in koji cli plugins ; do`
		`pushd $d`
		`- make DESTDIR=$RPM_BUILD_ROOT KOJI_MINIMAL=1 PYTHON=%{__python3} %{?install_opt} install`
		`+ make DESTDIR=$RPM_BUILD_ROOT KOJI_MINIMAL=1 PYTHON=%{__python3} install`
		`popd`
		`done`
		`# alter python interpreter in koji CLI`
		`@@ -505,10 +484,8 @@`
		`%config(noreplace) %attr(0640, root, apache) /etc/koji-hub/hub.conf`
		`%dir /etc/koji-hub/hub.conf.d`
		`%{_sbindir}/koji-sweep-db`
		`- %if %{use_systemd}`
		`%{_unitdir}/koji-sweep-db.service`
		`%{_unitdir}/koji-sweep-db.timer`
		`- %endif`

		`%files -n python%{python3_pkgversion}-%{name}-hub`
		`%{_datadir}/koji-hub/*.py`
		`@@ -534,11 +511,9 @@`

		`%files utils`
		`%{_sbindir}/kojira`
		`- %if %{use_systemd}`
		`%{_unitdir}/koji-gc.service`
		`%{_unitdir}/koji-gc.timer`
		`%{_unitdir}/kojira.service`
		`- %endif`
		`%dir /etc/kojira`
		`%config(noreplace) /etc/kojira/kojira.conf`
		`%{_sbindir}/koji-gc`
		`@@ -567,12 +542,7 @@`
		`%dir %{_libexecdir}/kojid`
		`%{_libexecdir}/kojid/mergerepos`
		`%endif`
		`- %if %{use_systemd}`
		`%{_unitdir}/kojid.service`
		`- %else`
		`- %{_initrddir}/kojid`
		`- %config(noreplace) /etc/sysconfig/kojid`
		`- %endif`
		`%dir /etc/kojid`
		`%config(noreplace) /etc/kojid/kojid.conf`
		`%attr(-,kojibuilder,kojibuilder) /etc/mock/koji`
		`@@ -580,8 +550,6 @@`
		`%pre builder`
		`/usr/sbin/useradd -r -s /bin/bash -G mock -d /builddir -M kojibuilder 2>/dev/null \|\|:`

		`- %if %{use_systemd}`
		`-`
		`%post builder`
		`%systemd_post kojid.service`

		`@@ -591,33 +559,14 @@`
		`%postun builder`
		`%systemd_postun kojid.service`

		`- %else`
		`-`
		`- %post builder`
		`- /sbin/chkconfig --add kojid`
		`-`
		`- %preun builder`
		`- if [ $1 = 0 ]; then`
		`- /sbin/service kojid stop &> /dev/null`
		`- /sbin/chkconfig --del kojid`
		`- fi`
		`- %endif`
		`-`
		`%files vm`
		`%{_sbindir}/kojivmd`
		`#dir %%{_datadir}/kojivmd`
		`%{_datadir}/kojivmd/kojikamid`
		`- %if %{use_systemd}`
		`%{_unitdir}/kojivmd.service`
		`- %else`
		`- %{_initrddir}/kojivmd`
		`- %config(noreplace) /etc/sysconfig/kojivmd`
		`- %endif`
		`%dir /etc/kojivmd`
		`%config(noreplace) /etc/kojivmd/kojivmd.conf`

		`- %if %{use_systemd}`
		`-`
		`%post vm`
		`%systemd_post kojivmd.service`

		`@@ -627,19 +576,6 @@`
		`%postun vm`
		`%systemd_postun kojivmd.service`

		`- %else`
		`-`
		`- %post vm`
		`- /sbin/chkconfig --add kojivmd`
		`-`
		`- %preun vm`
		`- if [ $1 = 0 ]; then`
		`- /sbin/service kojivmd stop &> /dev/null`
		`- /sbin/chkconfig --del kojivmd`
		`- fi`
		`-`
		`- %if %{use_systemd}`
		`-`
		`%post utils`
		`%systemd_post kojira.service`

		`@@ -649,18 +585,6 @@`
		`%postun utils`
		`%systemd_postun kojira.service`

		`- %else`
		`- %post utils`
		`- /sbin/chkconfig --add kojira`
		`- /sbin/service kojira condrestart &> /dev/null \|\| :`
		`- %preun utils`
		`- if [ $1 = 0 ]; then`
		`- /sbin/service kojira stop &> /dev/null \|\| :`
		`- /sbin/chkconfig --del kojira`
		`- fi`
		`- %endif`
		`- %endif`
		`-`
		`%changelog`
		`* Tue Jul 28 2020 Mike McLean <mikem at redhat.com> - 1.22.0-1`
		`- PR#2404: release bump and changelog`

koji/__init__.py

file modified

-4

		`@@ -3304,10 +3304,6 @@`
		`t = datetime.datetime.fromtimestamp(value)`
		`else:`
		`t = value`
		`- # return date in local timezone, py 2.6 has tzone as astimezone required parameter`
		`- # would work simply as t.astimezone() for py 2.7+`
		`- if t.tzinfo is None:`
		`- t = t.replace(tzinfo=dateutil.tz.gettz())`
		`t = t.astimezone(dateutil.tz.gettz())`
		`return datetime.datetime.strftime(t, '%a, %d %b %Y %H:%M:%S %Z')`

setup.py

file modified

+2 -11

		`@@ -1,7 +1,5 @@`
		`from __future__ import absolute_import`

		`- import sys`
		`-`
		`from setuptools import setup`


		`@@ -13,6 +11,7 @@`

		`requires = [`
		`'python-dateutil',`
		`+ 'pyOpenSSL',`
		`'requests',`
		`'requests-gssapi',`
		`'six',`
		`@@ -20,13 +19,6 @@`
		`# 'rpm-py-installer', # it is optional feature`
		`# 'rpm',`
		`]`
		`- # since pyOpenSSL-18.0.0, py26 support is dropped`
		`- # see https://pagure.io/koji/issue/1060`
		`- if sys.version_info[0] == 2 and sys.version_info[1] < 7:`
		`- requires.append('pyOpenSSL<18.0.0')`
		`- else:`
		`- requires.append('pyOpenSSL')`
		`-`
		`return requires`


		`@@ -51,7 +43,6 @@`
		`"Intended Audience :: Developers",`
		`"License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)",`
		`"Natural Language :: English",`
		`- "Programming Language :: Python :: 2.6",`
		`"Programming Language :: Python :: 2.7",`
		`"Programming Language :: Python :: 3",`
		`"Operating System :: POSIX :: Linux",`
		`@@ -74,6 +65,6 @@`
		`'util/koji-sweep-db',`
		`'util/kojira',`
		`],`
		`- python_requires='>=2.6',`
		`+ python_requires='>=2.7',`
		`install_requires=get_install_requires(),`
		`)`

test-requirements.txt

file modified

+1 -3

		`@@ -2,8 +2,6 @@`
		`flake8`
		`flake8-import-order`
		`mock<=2.0.0`
		`- requests-mock;python_version >= '2.7'`
		`- requests-mock<1.5.0;python_version < '2.7'`
		`+ requests-mock`
		`coverage`
		`nose`
		`- unittest2;python_version < '3.0'`

tests/test_builder/test_build_notification.py

file modified

+1 -6

		`@@ -5,6 +5,7 @@`
		`import os`
		`import tempfile`
		`import time`
		`+ import unittest`

		`import mock`
		`import six`
		`@@ -13,12 +14,6 @@`
		`import koji.util`
		`from .loadkojid import kojid`

		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`-`
		`-`

		`class MyClientSession(koji.ClientSession):`

tests/test_builder/test_choose_taskarch.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import mock`
		`import rpm`
		`import tempfile`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`
		`import koji`
		`from .loadkojid import kojid`
		`from six.moves import range`

tests/test_builder/test_delay_times.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji.daemon`
		`import koji`

tests/test_builder/test_taskparams.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import inspect`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`
		`import koji`
		`import koji.tasks`

tests/test_builder/test_volume_id.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import tempfile`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`
		`from .loadkojid import kojid`
		`import logging`

tests/test_cli/test_activate_session.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import mock`
		`import shutil`
		`import tempfile`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.lib import activate_session`

tests/test_cli/test_add_group.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`

		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_add_group`
		`from . import utils`

tests/test_cli/test_add_group_pkg.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_add_group_pkg`
		`from . import utils`

tests/test_cli/test_add_group_req.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_add_group_req`
		`from . import utils`

tests/test_cli/test_add_host_to_channel.py

file modified

+1 -4

		`@@ -4,10 +4,7 @@`
		`import os`
		`import six`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_add_host_to_channel`
		`from . import utils`

tests/test_cli/test_add_notification.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import koji`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`
		`from six.moves import StringIO`

		`from koji_cli.commands import handle_add_notification`

tests/test_cli/test_add_pkg.py

file modified

+1 -4

		`@@ -4,10 +4,7 @@`
		`import os`
		`import six`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from mock import call`

tests/test_cli/test_add_tag.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_add_tag`
		`from . import utils`

tests/test_cli/test_add_user.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_add_user`
		`from . import utils`

tests/test_cli/test_add_volume.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_add_volume`
		`from . import utils`

tests/test_cli/test_assign_task.py

file modified

+1 -6

		`@@ -1,12 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- import os`
		`import six`
		`- import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`from koji_cli.commands import handle_assign_task`

tests/test_cli/test_block_group_pkg.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_block_group_pkg`
		`from . import utils`

tests/test_cli/test_block_group_req.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_block_group_req`
		`from . import utils`

tests/test_cli/test_call.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import json`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_call`
		`from . import utils`

tests/test_cli/test_chain_build.py

file modified

+1 -4

		`@@ -4,10 +4,7 @@`
		`import os`
		`import six`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_chain_build`
		`from . import utils`

tests/test_cli/test_clone_tag.py

file modified

+1 -4

		`@@ -4,10 +4,7 @@`
		`import six`
		`from mock import call`

		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`from koji_cli.commands import handle_clone_tag`

tests/test_cli/test_disable_host.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from mock import call`
		`from koji_cli.commands import handle_disable_host`

tests/test_cli/test_disable_user.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_disable_user`
		`from . import utils`

tests/test_cli/test_dist_repo.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import copy`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`


		`from koji_cli.commands import handle_dist_repo`

tests/test_cli/test_download_file.py

file modified

+1 -4

		`@@ -6,10 +6,7 @@`
		`import os`
		`import requests_mock`
		`import requests`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.lib import download_file, _download_progress`

tests/test_cli/test_edit_external_repo.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`from koji_cli.commands import handle_edit_external_repo`

tests/test_cli/test_edit_host.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import os`
		`import six`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from mock import call`

tests/test_cli/test_edit_notification.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import koji`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`
		`from six.moves import StringIO`

		`from koji_cli.commands import handle_edit_notification`

tests/test_cli/test_edit_user.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import os`
		`import six`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`


		`from koji_cli.commands import handle_edit_user`

tests/test_cli/test_enable_host.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from mock import call`
		`from koji_cli.commands import handle_enable_host`

tests/test_cli/test_enable_user.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_enable_user`
		`from . import utils`

tests/test_cli/test_grant_cg_access.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_grant_cg_access`
		`from . import utils`

tests/test_cli/test_grant_permission.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_grant_permission`
		`from . import utils`

tests/test_cli/test_hello.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`from koji_cli.commands import handle_moshimoshi, _printable_unicode`

tests/test_cli/test_image_build.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import mock`
		`import six`
		`import os`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`

tests/test_cli/test_image_build_indirection.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`

tests/test_cli/test_import.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import mock`
		`import os`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`from koji_cli.commands import handle_import`

tests/test_cli/test_import_cg.py

file modified

+1 -4

		`@@ -8,10 +8,7 @@`

		`import os`

		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`


		`class TestImportCG(utils.CliTestCase):`

tests/test_cli/test_import_comps.py

file modified

+1 -4

		`@@ -4,10 +4,7 @@`
		`import os`
		`import six`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`try:`
		`import libcomps`

tests/test_cli/test_import_sig.py

file modified

+1 -4

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

		`from mock import call`
		`from koji.util import base64encode`

tests/test_cli/test_list_api.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import anon_handle_list_api`
		`from . import utils`

tests/test_cli/test_list_channels.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_list_commands.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import mock`
		`import os`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from . import loadcli, utils`
		`cli = loadcli.cli`

tests/test_cli/test_list_groups.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import mock`
		`import six`
		`import time`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import anon_handle_list_groups`
		`from . import utils`

tests/test_cli/test_list_notifications.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`
		`from six.moves import StringIO`

		`import koji`

tests/test_cli/test_list_permissions.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_list_permissions`
		`from . import utils`

tests/test_cli/test_list_tasks.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`from koji_cli.lib import _list_tasks`

tests/test_cli/test_list_volumes.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_list_volumes`
		`from . import utils`

tests/test_cli/test_load_plugins.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`

		`import os`

		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import mock`

tests/test_cli/test_maven_build.py

file modified

+1 -4

		`@@ -5,10 +5,7 @@`
		`import os`
		`import six`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_maven_build`
		`from . import utils`

tests/test_cli/test_maven_chain.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_maven_chain`
		`from . import utils`

tests/test_cli/test_mock_config.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import anon_handle_mock_config`
		`from . import utils`

tests/test_cli/test_move_build.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_move_build`
		`from . import utils`

tests/test_cli/test_regen_repo.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import copy`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_regen_repo`
		`from . import utils`

tests/test_cli/test_remove_channel.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import os`
		`import six`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_remove_channel`
		`from . import utils`

tests/test_cli/test_remove_host_from_channel.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import os`
		`import six`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_remove_host_from_channel`
		`from . import utils`

tests/test_cli/test_remove_notification.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import koji`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from six.moves import StringIO`

tests/test_cli/test_remove_pkg.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import os`
		`import six`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from mock import call`

tests/test_cli/test_rename_channel.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import os`
		`import six`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_rename_channel`
		`from . import utils`

tests/test_cli/test_restart_host.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`from koji_cli.commands import handle_restart_hosts`

tests/test_cli/test_resubmit.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`from __future__ import print_function`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_resubmit`
		`from . import utils`

tests/test_cli/test_revoke_cg_access.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_revoke_cg_access`
		`from . import utils`

tests/test_cli/test_revoke_permission.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_revoke_permission`
		`from . import utils`

tests/test_cli/test_running_in_bg.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.lib import _running_in_bg`

tests/test_cli/test_search.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import anon_handle_search`
		`from . import utils`

tests/test_cli/test_set_build_volume.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_set_build_volume`
		`from . import utils`

tests/test_cli/test_set_pkg_arches.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_set_pkg_arches`
		`from . import utils`

tests/test_cli/test_set_pkg_owner.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_set_pkg_owner`
		`from . import utils`

tests/test_cli/test_set_task_priority.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_set_task_priority`
		`from . import utils`

tests/test_cli/test_spin_commands.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import mock`
		`import six`

		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`from koji_cli.commands import handle_spin_livecd, handle_spin_livemedia, handle_spin_appliance, _build_image`

tests/test_cli/test_tag_build.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_tag_build`
		`from . import utils`

tests/test_cli/test_taskinfo.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import mock`
		`import six`
		`import time`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`from koji_cli.commands import anon_handle_taskinfo, \`

tests/test_cli/test_unblock_group_pkg.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_unblock_group_pkg`
		`from . import utils`

tests/test_cli/test_unblock_group_req.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_unblock_group_req`
		`from . import utils`

tests/test_cli/test_unblock_pkg.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`


		`from koji_cli.commands import handle_unblock_pkg`

tests/test_cli/test_unique_path.py

file modified

+1 -4

		`@@ -1,8 +1,5 @@`
		`from __future__ import absolute_import`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from six.moves import range`

tests/test_cli/test_upload_progress_callback.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`


		`from koji_cli.lib import _format_size, _format_secs, _progress_callback`

tests/test_cli/test_wait_repo.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import copy`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import anon_handle_wait_repo`
		`from . import utils`

tests/test_cli/test_watch_tasks.py

file modified

+1 -4

		`@@ -4,10 +4,7 @@`
		`import os`
		`import six`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from mock import call`
		`from six.moves import range`

tests/test_cli/test_wrapper_rpm.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji_cli.commands import handle_wrapper_rpm`
		`from . import utils`

tests/test_cli/test_write_signed_rpm.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import hashlib`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from mock import call`
		`import koji`

tests/test_cli/utils.py

file modified

+1 -4

		`@@ -5,10 +5,7 @@`
		`import six`
		`import sys`
		`from six.moves import map`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`


		`PROGNAME = os.path.basename(sys.argv[0]) or 'koji'`

tests/test_docs_version.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import os`
		`import six`
		`import subprocess`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`# docs version lives in docs/source/conf.py`
		`TOPDIR = os.path.dirname(__file__) + '/..'`

tests/test_hub/test_models/test_host.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`import kojihub`

tests/test_kojira/test_repo_manager.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import time`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`

tests/test_lib/test_argspec.py

file modified

+1 -4

		`@@ -1,8 +1,5 @@`
		`from __future__ import absolute_import`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji.util`

tests/test_lib/test_auth.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`

		`import mock`

		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`
		`import six`

		`import koji`

tests/test_lib/test_base64.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`# coding=utf-8`
		`from __future__ import absolute_import`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji.util import base64encode`

tests/test_lib/test_check_sigmd5.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import os.path`
		`import shutil`
		`import tempfile`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji.util import check_sigmd5`

tests/test_lib/test_client_session.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import mock`
		`import six`
		`import weakref`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`from koji.xmlrpcplus import Fault`

tests/test_lib/test_context.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import time`
		`import random`
		`from six.moves import range`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji.context import context`

tests/test_lib/test_decode_bytes.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`# coding=utf-8`
		`from __future__ import absolute_import`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from koji.util import decode_bytes`

tests/test_lib/test_encode_datetime.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import datetime`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji.util`
		`from koji.xmlrpcplus import DateTime`

tests/test_lib/test_file_ops.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`

		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import mock`
		`import errno`

tests/test_lib/test_fixEncoding.py

file modified

+1 -4

		`@@ -7,10 +7,7 @@`
		`import koji`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`


		`class FixEncodingTestCase(unittest.TestCase):`

tests/test_lib/test_format_time.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import os`
		`import time`
		`import locale`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import six.moves.xmlrpc_client as xmlrpc_client`

tests/test_lib/test_gen_mock_config.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import ast`
		`import os`
		`import os.path`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`

tests/test_lib/test_grab_session_options.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import optparse`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`

tests/test_lib/test_gssapi.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`

		`import mock`
		`import os`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`

tests/test_lib/test_multicall_session.py

file modified

+1 -4

		`@@ -1,8 +1,5 @@`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`

tests/test_lib/test_parse_arches.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`# coding: utf-8`
		`from __future__ import absolute_import`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`
		`import koji`

		`class TestParseArchesString(unittest.TestCase):`

tests/test_lib/test_parsers.py

file modified

+1 -4

		`@@ -6,10 +6,7 @@`
		`import mock`
		`import os`
		`import rpm`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`

tests/test_lib/test_plugin.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import datetime`
		`import mock`
		`from six.moves import range`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`import koji.util`

tests/test_lib/test_policy.py

file modified

+1 -4

		`@@ -1,8 +1,5 @@`
		`from __future__ import absolute_import`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from nose.tools import raises`

tests/test_lib/test_profiles.py

file modified

+1 -4

		`@@ -6,10 +6,7 @@`
		`import mock`
		`from six.moves import range`

		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`class ProfilesTestCase(unittest.TestCase):`

tests/test_lib/test_restart_tasks.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import mock`
		`import shutil`
		`import tempfile`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji.tasks`

tests/test_lib/test_tasks.py

file modified

+1 -4

		`@@ -3,10 +3,7 @@`
		`import shutil`
		`import six`
		`from six.moves import range`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from os import path, makedirs`
		`from tempfile import gettempdir`

tests/test_lib/test_utils.py

file modified

+1 -4

		`@@ -10,10 +10,7 @@`
		`import six.moves.configparser`
		`import time`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import requests_mock`
		`from mock import call, patch`

tests/test_lib/test_xmlrpcplus.py

file modified

+1 -4

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

		`from six.moves import xmlrpc_client`
		`from koji import xmlrpcplus`

tests/test_plugins/test_protonmsg.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import six`
		`import protonmsg`
		`import tempfile`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`from mock import patch, MagicMock`
		`from koji.context import context`

tests/test_plugins/test_runroot_builder.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import copy`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import six.moves.configparser`

tests/test_plugins/test_runroot_cli.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import io`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`from . import load_plugin`

tests/test_plugins/test_runroot_hub.py

file modified

+1 -4

		`@@ -1,9 +1,6 @@`
		`from __future__ import absolute_import`
		`import mock`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`import runroot_hub`

tests/test_plugins/test_save_failed_tree_builder.py

file modified

+1 -4

		`@@ -2,10 +2,7 @@`
		`import mock`
		`import os`
		`import sys`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`# alter pythonpath to not load hub plugin`
		`sys.path = [os.path.join(os.path.dirname(__file__), '../../plugins/builder')] + sys.path`

tests/test_plugins/test_save_failed_tree_cli.py

file modified

+1 -4

		`@@ -1,10 +1,7 @@`
		`from __future__ import absolute_import`
		`import mock`
		`import six`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`

tests/test_scm.py

file modified

+1 -4

		`@@ -4,10 +4,7 @@`
		`import shutil`
		`import six`
		`import tempfile`
		`- try:`
		`- import unittest2 as unittest`
		`- except ImportError:`
		`- import unittest`
		`+ import unittest`

		`import koji`
		`import koji.daemon`

util/Makefile

file modified

+1 -8

		`@@ -1,6 +1,5 @@`
		`BINFILES = kojira koji-gc koji-shadow koji-sweep-db koji-sidetag-cleanup`
		`SYSTEMDSYSTEMUNITDIR = $(shell pkg-config systemd --variable=systemdsystemunitdir)`
		`- TYPE = systemd`

		`_default:`
		`@echo "nothing to make. try make install"`
		`@@ -29,16 +28,10 @@`
		`mkdir -p $(DESTDIR)/etc/koji-shadow`
		`install -p -m 644 koji-shadow.conf $(DESTDIR)/etc/koji-shadow/koji-shadow.conf`

		`- install-systemd: _install`
		`+ install: _install`
		`mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)`
		`install -p -m 644 kojira.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)`
		`install -p -m 644 koji-gc.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)`
		`install -p -m 644 koji-gc.timer $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)`
		`install -p -m 644 koji-sweep-db.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)`
		`install -p -m 644 koji-sweep-db.timer $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)`
		`-`
		`- install-sysv: _install`
		`- # no more utils support for sysv`
		`- true`
		`-`
		`- install: install-$(TYPE)`

util/koji-gc

file modified

+9 -13

		`@@ -1,4 +1,4 @@`
		`- #!/usr/bin/python2`
		`+ #!/usr/bin/python3`

		`# koji-gc: a garbage collection tool for Koji`
		`# Copyright (c) 2007-2014 Red Hat, Inc.`
		`@@ -6,8 +6,6 @@`
		`# Authors:`
		`# Mike McLean <mikem@redhat.com>`

		`- from __future__ import absolute_import`
		`-`
		`import datetime`
		`import fcntl`
		`import fnmatch`
		`@@ -17,13 +15,11 @@`
		`import smtplib`
		`import sys`
		`import time`
		`+ import xmlrpc.client # for Fault`
		`+ from email.mime import text as MIMEText`
		`from string import Template`

		`import requests`
		`- import six`
		`- import six.moves.configparser`
		`- import six.moves.xmlrpc_client # for Fault`
		`- from six.moves import email_mime_text as MIMEText`

		`import koji`
		`import koji.policy`
		`@@ -471,7 +467,7 @@`
		`mcall = koji.MultiCallSession(session, batch=1000)`
		`for binfo in continuing:`
		`mcall.buildReferences(binfo['id'], limit=10, lazy=True)`
		`- for binfo, [refs] in six.moves.zip(continuing, mcall.call_all()):`
		`+ for binfo, [refs] in zip(continuing, mcall.call_all()):`
		`i += 1`
		`nvr = binfo['nvr']`
		`# XXX - this is more data than we need`
		`@@ -583,7 +579,7 @@`
		`# best we can do currently`
		`owner = binfo['owner_id']`
		`else:`
		`- owner = max([(n, k) for k, n in six.iteritems(count)])[1]`
		`+ owner = max([(n, k) for k, n in count.items()])[1]`
		`mcall.packageListAdd(trashcan_tag, binfo['name'], owner)`
		`mcall.tagBuildBypass(trashcan_tag, binfo['id'], force=True)`
		`# run all packageListAdd/tagBuildBypass finally`
		`@@ -655,7 +651,7 @@`
		`mcall = koji.MultiCallSession(session, batch=1000)`
		`for nvr, binfo in trash:`
		`mcall.listTags(build=binfo['id'], perms=False)`
		`- for (nvr, binfo), [tags] in six.moves.zip(trash, mcall.call_all()):`
		`+ for (nvr, binfo), [tags] in zip(trash, mcall.call_all()):`
		`# see if build has been tagged elsewhere`
		`tags = [t['name'] for t in tags if t['name'] != trashcan_tag]`
		`if tags:`
		`@@ -713,7 +709,7 @@`
		`mcall.untagBuildBypass(trashcan_tag, binfo['id'])`
		`mcall.deleteBuild(binfo['id'])`

		`- for binfo, result in six.moves.zip(continuing, mcall.call_all()):`
		`+ for binfo, result in zip(continuing, mcall.call_all()):`
		`if isinstance(result, dict):`
		`print("Warning: deletion failed: %s" % result['faultString'])`
		`# TODO - log details for delete failures`
		`@@ -936,7 +932,7 @@`
		`session.untagBuildBypass(taginfo['id'], entry['build_id'],`
		`force=bypass)`
		`untagged.setdefault(nvr, {})[tagname] = 1`
		`- except (six.moves.xmlrpc_client.Fault, koji.GenericError) as e:`
		`+ except (xmlrpc.client.Fault, koji.GenericError) as e:`
		`print("Warning: untag operation failed: %s" % e)`
		`pass`
		`# if action == 'keep' do nothing`
		`@@ -970,7 +966,7 @@`
		`print("Deleting untagged build: %s" % nvr)`
		`try:`
		`session.deleteBuild(build_id, strict=True)`
		`- except (six.moves.xmlrpc_client.Fault, koji.GenericError) as e:`
		`+ except (xmlrpc.client.Fault, koji.GenericError) as e:`
		`print("Warning: deletion failed: %s" % e)`
		`# server issue`
		`pass`

util/koji-shadow

file modified

+6 -9

		`@@ -1,4 +1,4 @@`
		`- #!/usr/bin/python2`
		`+ #!/usr/bin/python3`

		`# koji-shadow: a tool to shadow builds between koji instances`
		`# Copyright (c) 2007-2016 Red Hat, Inc.`
		`@@ -37,9 +37,6 @@`

		`import requests`
		`import rpm`
		`- import six`
		`- import six.moves.xmlrpc_client # for Fault`
		`- from six.moves import range`

		`import koji`
		`from koji.util import to_list`
		`@@ -513,7 +510,7 @@`
		`# changes happened during the build startup and some subtasks got the old`
		`# repo and others the new one.`
		`base = []`
		`- for name, brlist in six.iteritems(bases):`
		`+ for name, brlist in bases.items():`
		`# We want to determine for each name if that package was present`
		`# in /all/ the buildroots or just some.`
		`# Because brlist is constructed only from elements of buildroots, we`
		`@@ -525,7 +522,7 @@`
		`if len(tags) > 1:`
		`log("Warning: found multiple buildroot tags for %s: %s" %`
		`(self.nvr, to_list(tags.keys())))`
		`- counts = sorted([(n, tag) for tag, n in six.iteritems(tags)])`
		`+ counts = sorted([(n, tag) for tag, n in tags.items()])`
		`tag = counts[-1][1]`
		`else:`
		`tag = to_list(tags.keys())[0]`
		`@@ -973,7 +970,7 @@`
		`for pkg in session.listPackages(pkgID=name):`
		`owners.setdefault(pkg['owner_id'], []).append(pkg)`
		`if owners:`
		`- order = sorted([(len(v), k) for k, v in six.iteritems(owners)])`
		`+ order = sorted([(len(v), k) for k, v in owners.items()])`
		`owner = order[-1][1]`
		`else:`
		`# just use ourselves`
		`@@ -1119,7 +1116,7 @@`
		`nvr = dep.substitute`
		`problem_counts.setdefault(nvr, 0)`
		`problem_counts[nvr] += 1`
		`- order = [(c, nvr) for (nvr, c) in six.iteritems(problem_counts)]`
		`+ order = [(c, nvr) for (nvr, c) in problem_counts.items()]`
		`if order:`
		`order.sort(reverse=True)`
		`# print top 5 problems`
		`@@ -1200,7 +1197,7 @@`
		`ret = False`
		`if options.max_jobs and len(self.state_idx['pending']) >= options.max_jobs:`
		`return ret`
		`- missing = sorted([(b.order, b.id, b) for b in six.itervalues(self.state_idx['missing'])])`
		`+ missing = sorted([(b.order, b.id, b) for b in self.state_idx['missing'].values()])`
		`for order, build_id, build in missing:`
		`if not self.checkBuildDeps(build):`
		`continue`

util/koji-sidetag-cleanup

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- #!/usr/bin/python2`
		`+ #!/usr/bin/python3`

		`import sys`
		`import configparser`

util/koji-sweep-db

file modified

+3 -4

		`@@ -1,11 +1,10 @@`
		`#!/usr/bin/python2`

		`import os`
		`+ import xmlrpc.client`
		`+ from configparser import RawConfigParser`
		`from optparse import OptionParser`

		`- from six.moves import xmlrpc_client`
		`- from six.moves.configparser import RawConfigParser`
		`-`
		`import koji.db`


		`@@ -71,7 +70,7 @@`
		`for row in cursor.fetchall():`
		`task_id, request = row`
		`try:`
		`- params, method = xmlrpc_client.loads(request)`
		`+ params, method = xmlrpc.client.loads(request)`
		`opts = params[2]`
		`if opts['scratch']:`
		`cursor.execute("INSERT INTO temp_scratch_tasks VALUES (%s)", (task_id,))`

util/kojira

file modified

+3 -6

		`@@ -1,4 +1,4 @@`
		`- #!/usr/bin/python2`
		`+ #!/usr/bin/python3`

		`# Koji Repository Administrator (kojira)`
		`# Copyright (c) 2005-2014 Red Hat, Inc.`
		`@@ -20,8 +20,6 @@`
		`# Authors:`
		`# Mike McLean <mikem@redhat.com>`

		`- from __future__ import absolute_import, division`
		`-`
		`import errno`
		`import json`
		`import logging`
		`@@ -38,7 +36,6 @@`
		`from xml.etree import ElementTree`

		`import requests`
		`- import six`

		`import koji`
		`from koji.util import deprecated, parseStatus, rmtree, to_list`
		`@@ -300,9 +297,9 @@`
		`def printState(self):`
		`self.logger.debug('Tracking %i repos, %i child processes',`
		`len(self.repos), len(self.delete_pids))`
		`- for tag_id, task_id in six.iteritems(self.tasks):`
		`+ for tag_id, task_id in self.tasks.items():`
		`self.logger.debug("Tracking task %s for tag %s", task_id, tag_id)`
		`- for pid, desc in six.iteritems(self.delete_pids):`
		`+ for pid, desc in self.delete_pids.items():`
		`self.logger.debug("Delete job %s: %r", pid, desc)`

		`def rmtree(self, path):`

vm/Makefile

file modified

+1 -11

		`@@ -1,7 +1,6 @@`
		`BINFILES = kojivmd`
		`SHAREFILES = kojikamid`
		`SYSTEMDSYSTEMUNITDIR = $(shell pkg-config systemd --variable=systemdsystemunitdir)`
		`- TYPE = systemd`

		`_default:`
		`@echo "nothing to make. try make install"`
		`@@ -28,15 +27,6 @@`
		`mkdir -p $(DESTDIR)/etc/kojivmd`
		`install -p -m 644 kojivmd.conf $(DESTDIR)/etc/kojivmd/kojivmd.conf`

		`- install-systemd: _install`
		`+ install: _install`
		`mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)`
		`install -p -m 644 kojivmd.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)`
		`-`
		`- install-sysv: _install`
		`- mkdir -p $(DESTDIR)/etc/rc.d/init.d`
		`- install -p -m 755 kojivmd.init $(DESTDIR)/etc/rc.d/init.d/kojivmd`
		`-`
		`- mkdir -p $(DESTDIR)/etc/sysconfig`
		`- install -p -m 644 kojivmd.sysconfig $(DESTDIR)/etc/sysconfig/kojivmd`
		`-`
		`- install: install-$(TYPE)`

vm/kojikamid.py

file modified

+6 -11

		`@@ -26,8 +26,6 @@`
		`# kojiwind --install`
		`# in a cygwin shell.`

		`- from __future__ import absolute_import`
		`-`
		`import base64`
		`import glob`
		`import hashlib`
		`@@ -43,12 +41,11 @@`
		`import zipfile`
		`from optparse import OptionParser`

		`- import six`
		`- import six.moves.xmlrpc_client`
		`+ import xmlrpc.client`
		`# urllib is required by the SCM class which is substituted into this file`
		`# do not remove the import below`
		`- from six.moves import urllib # noqa: F401`
		`- from six.moves.configparser import RawConfigParser`
		`+ import urllib # noqa: F401`
		`+ from configparser import RawConfigParser`

		`MANAGER_PORT = 7000`

		`@@ -630,14 +627,12 @@`
		`macaddr, gateway = find_net_info()`
		`logger.debug('found MAC address %s, connecting to %s:%s',`
		`macaddr, gateway, MANAGER_PORT)`
		`- server = six.moves.xmlrpc_client.ServerProxy('http://%s:%s/' %`
		`- (gateway, MANAGER_PORT), allow_none=True)`
		`+ server = xmlrpc.client.ServerProxy('http://%s:%s/' % (gateway, MANAGER_PORT), allow_none=True)`
		`# we would set a timeout on the socket here, but that is apparently not`
		`# supported by python/cygwin/Windows`
		`task_port = server.getPort(macaddr)`
		`logger.debug('found task-specific port %s', task_port)`
		`- return six.moves.xmlrpc_client.ServerProxy('http://%s:%s/' % (gateway, task_port),`
		`- allow_none=True)`
		`+ return xmlrpc.client.ServerProxy('http://%s:%s/' % (gateway, task_port), allow_none=True)`


		`def get_options():`
		`@@ -690,7 +685,7 @@`
		`logpath = os.path.join(build.source_dir, relpath)`
		`if logpath not in logs:`
		`logs[logpath] = (relpath, None)`
		`- for log, (relpath, fd) in six.iteritems(logs):`
		`+ for log, (relpath, fd) in logs.items():`
		`if not fd:`
		`if os.path.isfile(log):`
		`try:`

vm/kojivmd

file modified

+16 -20

		`@@ -1,4 +1,4 @@`
		`- #!/usr/bin/python2`
		`+ #!/usr/bin/python3`

		`# Koji virtual machine management daemon`
		`# Copyright (c) 2010-2014 Red Hat, Inc.`
		`@@ -35,14 +35,13 @@`
		`import sys`
		`import threading`
		`import time`
		`+ import xmlrpc`
		`from contextlib import closing`
		`from optparse import OptionParser`

		`import libvirt`
		`import libxml2`
		`import requests`
		`- import six.moves.xmlrpc_client`
		`- import six.moves.xmlrpc_server`

		`import koji`
		`import koji.util`
		`@@ -254,24 +253,24 @@`
		`# Tasks for handling VM lifecycle`
		`####################`

		`- class DaemonXMLRPCServer(six.moves.xmlrpc_server.SimpleXMLRPCServer):`
		`+ class DaemonXMLRPCServer(xmlrpc.server.SimpleXMLRPCServer):`
		`allow_reuse_address = True`

		`def __init__(self, addr, port):`
		`if sys.version_info[:2] <= (2, 4):`
		`- six.moves.xmlrpc_server.SimpleXMLRPCServer.__init__(self, (addr, port),`
		`- logRequests=False)`
		`+ xmlrpc.server.SimpleXMLRPCServer.__init__(self, (addr, port),`
		`+ logRequests=False)`
		`else:`
		`- six.moves.xmlrpc_server.SimpleXMLRPCServer.__init__(self, (addr, port),`
		`- logRequests=False,`
		`- allow_none=True)`
		`+ xmlrpc.server.SimpleXMLRPCServer.__init__(self, (addr, port),`
		`+ logRequests=False,`
		`+ allow_none=True)`
		`self.logger = logging.getLogger('koji.vm.DaemonXMLRPCServer')`
		`self.socket.settimeout(5)`
		`self.active = True`

		`def server_close(self):`
		`self.active = False`
		`- six.moves.xmlrpc_server.SimpleXMLRPCServer.server_close(self)`
		`+ xmlrpc.server.SimpleXMLRPCServer.server_close(self)`

		`def handle_while_active(self):`
		`while self.active:`
		`@@ -292,23 +291,20 @@`
		`# Copy and paste from SimpleXMLRPCServer, with the addition of passing`
		`# allow_none=True to xmlrpclib.dumps()`
		`def _marshaled_dispatch(self, data, dispatch_method=None):`
		`- params, method = six.moves.xmlrpc_client.loads(data)`
		`+ params, method = xmlrpc.client.loads(data)`
		`try:`
		`if dispatch_method is not None:`
		`response = dispatch_method(method, params)`
		`else:`
		`response = self._dispatch(method, params)`
		`response = (response,)`
		`- response = six.moves.xmlrpc_client.dumps(response,`
		`- methodresponse=1, allow_none=True)`
		`- except six.moves.xmlrpc_client.Fault as fault:`
		`- response = six.moves.xmlrpc_client.dumps(fault)`
		`+ response = xmlrpc.client.dumps(response, methodresponse=1, allow_none=True)`
		`+ except xmlrpc.client.Fault as fault:`
		`+ response = xmlrpc.client.dumps(fault)`
		`except Exception:`
		`# report exception back to server`
		`- response = six.moves.xmlrpc_client.dumps(`
		`- six.moves.xmlrpc_client.Fault(`
		`- 1, "%s:%s" %`
		`- (sys.exc_info()[0], sys.exc_info()[1]))`
		`+ response = xmlrpc.client.dumps(`
		`+ xmlrpc.client.Fault(1, "%s:%s" % (sys.exc_info()[0], sys.exc_info()[1]))`
		`)`
		`return response`

		`@@ -434,7 +430,7 @@`

		`def __init__(self, args, *kw):`
		`super(VMExecTask, self).__init__(args, *kw)`
		`- self.task_manager = six.moves.xmlrpc_client.ServerProxy(`
		`+ self.task_manager = xmlrpc.client.ServerProxy(`
		`'http://%s:%s/' % (self.options.privaddr, self.options.portbase), allow_none=True)`
		`self.port = None`
		`self.server = None`