python-modernize -f libmodernize.fixes.fix_import

builder/mergerepos

@@ -21,6 +21,7 @@
 # Largely borrowed from the mergerepo script included in createrepo and
 # written by Seth Vidal
 
+from __future__ import absolute_import
 import createrepo
 import os.path
 import rpmUtils.miscutils

koji/db.py

@@ -21,6 +21,7 @@
 #       Mike McLean <mikem@redhat.com>
 
 
+from __future__ import absolute_import
 import logging
 import sys
 import psycopg2
@@ -33,7 +34,7 @@ import psycopg2
 # del psycopg2.extensions.string_types[1266]
 import time
 import traceback
-import context
+from . import context
 import re
 
 POSITIONAL_RE = re.compile(r'%[a-z]')

koji/plugin.py

@@ -19,6 +19,7 @@
 #       Mike McLean <mikem@redhat.com>
 #       Mike Bonnet <mikeb@redhat.com>
 
+from __future__ import absolute_import
 import imp
 import koji
 import logging

koji/xmlrpcplus.py

@@ -2,6 +2,7 @@
 Custom xmlrpc handling for Koji
 """
 
+from __future__ import absolute_import
 import six
 import six.moves.xmlrpc_client as xmlrpc_client
 import types

plugins/builder/runroot.py

@@ -1,5 +1,6 @@
 # kojid plugin
 
+from __future__ import absolute_import
 import commands
 import koji
 import ConfigParser

plugins/builder/save_failed_tree.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import fnmatch
 import os
 import sys

plugins/cli/runroot.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import sys
 import time
 

plugins/cli/save_failed_tree.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import koji
 from koji.plugin import export_cli
 from koji_cli.lib import _, activate_session, OptionParser, watch_tasks

plugins/hub/echo.py

@@ -5,6 +5,7 @@
 # Authors:
 #     Mike Bonnet <mikeb@redhat.com>
 
+from __future__ import absolute_import
 from koji.plugin import callbacks, callback, ignore_error
 import logging
 

plugins/hub/messagebus.py

@@ -4,6 +4,7 @@
 # Authors:
 #     Mike Bonnet <mikeb@redhat.com>
 
+from __future__ import absolute_import
 from koji import PluginError
 from koji.context import context
 from koji.plugin import callbacks, callback, ignore_error, convert_datetime

plugins/hub/protonmsg.py

@@ -5,6 +5,7 @@
 # Authors:
 #     Mike Bonnet <mikeb@redhat.com>
 
+from __future__ import absolute_import
 import koji
 from koji.plugin import callback, ignore_error, convert_datetime
 from koji.context import context

plugins/hub/rpm2maven.py

@@ -5,6 +5,7 @@
 # Authors:
 #     Mike Bonnet <mikeb@redhat.com>
 
+from __future__ import absolute_import
 import koji
 from koji.context import context
 from koji.plugin import callback

plugins/hub/runroot_hub.py

@@ -3,6 +3,7 @@
 # plugin has a config file.  This hub plugin has no config file.
 
 
+from __future__ import absolute_import
 from koji.context import context
 from koji.plugin import export
 import koji

plugins/hub/save_failed_tree.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import sys
 import ConfigParser
 import koji

setup.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import sys
 from setuptools import setup
 

tests/test_cli/data/plugins/plugin1.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 from koji.plugin import export_cli, export_as
 
 @export_as('foobar')

tests/test_cli/fakeclient.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import koji
 

tests/test_cli/test_activate_session.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import shutil
 import tempfile

tests/test_cli/test_list_notifications.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_cli/test_list_tasks.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import six
 try:

tests/test_cli/utils.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+from __future__ import absolute_import
 import mock
 import os
 import six

tests/test_docs_version.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os
 import subprocess
 try:

tests/test_hub/test_add_btype.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 try:
     import unittest2 as unittest
 except ImportError:

tests/test_hub/test_add_external_rpm.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_add_host.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_add_host_to_channel.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_apply_query_opts.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import copy
 try:
     import unittest2 as unittest

tests/test_hub/test_cg_importer.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import os
 import shutil

tests/test_hub/test_check_volume_policy.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_complete_image_build.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import copy
 import json
 import mock

tests/test_hub/test_complete_maven_build.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import copy
 import json
 import mock

tests/test_hub/test_create_tag.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import copy
 import mock
 import shutil

tests/test_hub/test_delete_build.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_delete_tag.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_dist_repo.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 try:
     import unittest2 as unittest
 except ImportError:

tests/test_hub/test_edit_host.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_edit_tag.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_get_active_repos.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_get_archive_file.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_get_build_logs.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import os
 import shutil

tests/test_hub/test_get_build_type.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_get_host.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_get_next_release.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_get_upload_path.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os
 import mock
 import shutil

tests/test_hub/test_get_user_perms.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_get_verify_class.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 try:
     import unittest2 as unittest
 except ImportError:

tests/test_hub/test_group_operations.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_import_build.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import copy
 import mock
 import shutil

tests/test_hub/test_import_image_internal.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import os
 import shutil

tests/test_hub/test_insert_processor.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_list_archive_files.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_list_archives.py

@@ -1,5 +1,6 @@
+from __future__ import absolute_import
 import mock
-from utils import DBQueryTestCase
+from .utils import DBQueryTestCase
 
 import koji
 import kojihub

tests/test_hub/test_list_btypes.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_list_channels.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_list_hosts.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_list_task_output.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_listing.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_models/test_host.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_new_typed_build.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_notifications.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_pkglist.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_policy_tests.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_query_processor.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_recycle_build.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 
 import koji

tests/test_hub/test_remove_host_from_channel.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_repos.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import unittest
 

tests/test_hub/test_rpmdiff.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import copy
 import mock
 try:

tests/test_hub/test_savepoint.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import unittest
 

tests/test_hub/test_set_host_enabled.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_tag_operations.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import copy
 import mock
 import shutil

tests/test_hub/test_task_wait_results.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import xmlrpclib
 try:

tests/test_hub/test_update_processor.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/test_user_groups.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_hub/utils.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import six
 try:

tests/test_lib/test_argspec.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 try:
     import unittest2 as unittest
 except ImportError:

tests/test_lib/test_encode_datetime.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import datetime
 try:
     import unittest2 as unittest

tests/test_lib/test_gen_mock_config.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import ast
 import os
 import os.path

tests/test_lib_py2only/test_restart_tasks.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import shutil
 import tempfile

tests/test_plugins/load_plugin.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os
 import sys
 

tests/test_plugins/test_protonmsg.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import six
 import protonmsg
 import tempfile

tests/test_plugins/test_runroot_hub.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 try:
     import unittest2 as unittest

tests/test_plugins/test_save_failed_tree_cli.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import six
 try:
@@ -7,7 +8,7 @@ except ImportError:
 
 import koji
 
-import load_plugin
+from . import load_plugin
 save_failed_tree = load_plugin.load_plugin('cli', 'save_failed_tree')
 
 

tests/test_scm.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import logging
 import mock
 import shutil

tests/test_www/test_util.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 from kojiweb.util import formatMode

vm/kojivmd

@@ -20,6 +20,7 @@
 # Authors:
 #       Mike Bonnet <mikeb@redhat.com>
 
+from __future__ import absolute_import
 import koji
 import koji.util
 from koji.daemon import SCM, TaskManager

www/kojiweb/wsgi_publisher.py

@@ -19,6 +19,7 @@
 # Authors:
 #       Mike McLean <mikem@redhat.com>
 
+from __future__ import absolute_import
 import cgi
 import inspect
 import koji