diff --git a/builder/mergerepos b/builder/mergerepos index bb3ee6de..55a1938b 100755 --- a/builder/mergerepos +++ b/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 diff --git a/koji/db.py b/koji/db.py index 9e921912..c4e9ab33 100644 --- a/koji/db.py +++ b/koji/db.py @@ -21,6 +21,7 @@ # Mike McLean +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]') diff --git a/koji/plugin.py b/koji/plugin.py index 396b8111..5250e87e 100644 --- a/koji/plugin.py +++ b/koji/plugin.py @@ -19,6 +19,7 @@ # Mike McLean # Mike Bonnet +from __future__ import absolute_import import imp import koji import logging diff --git a/koji/xmlrpcplus.py b/koji/xmlrpcplus.py index 9164cd77..06284b45 100644 --- a/koji/xmlrpcplus.py +++ b/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 diff --git a/plugins/builder/runroot.py b/plugins/builder/runroot.py index cc7bdbb7..a558ef8b 100644 --- a/plugins/builder/runroot.py +++ b/plugins/builder/runroot.py @@ -1,5 +1,6 @@ # kojid plugin +from __future__ import absolute_import import commands import koji import ConfigParser diff --git a/plugins/builder/save_failed_tree.py b/plugins/builder/save_failed_tree.py index 4c202c92..eabf0301 100644 --- a/plugins/builder/save_failed_tree.py +++ b/plugins/builder/save_failed_tree.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import fnmatch import os import sys diff --git a/plugins/cli/runroot.py b/plugins/cli/runroot.py index 942e64cd..9f0a4631 100644 --- a/plugins/cli/runroot.py +++ b/plugins/cli/runroot.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import sys import time diff --git a/plugins/cli/save_failed_tree.py b/plugins/cli/save_failed_tree.py index 46b5fa3a..5bf1a6d8 100644 --- a/plugins/cli/save_failed_tree.py +++ b/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 diff --git a/plugins/hub/echo.py b/plugins/hub/echo.py index 38c96baf..739dfebf 100644 --- a/plugins/hub/echo.py +++ b/plugins/hub/echo.py @@ -5,6 +5,7 @@ # Authors: # Mike Bonnet +from __future__ import absolute_import from koji.plugin import callbacks, callback, ignore_error import logging diff --git a/plugins/hub/messagebus.py b/plugins/hub/messagebus.py index a45561c8..ffc0e50a 100644 --- a/plugins/hub/messagebus.py +++ b/plugins/hub/messagebus.py @@ -4,6 +4,7 @@ # Authors: # Mike Bonnet +from __future__ import absolute_import from koji import PluginError from koji.context import context from koji.plugin import callbacks, callback, ignore_error, convert_datetime diff --git a/plugins/hub/protonmsg.py b/plugins/hub/protonmsg.py index 85165ba7..6ba7afce 100644 --- a/plugins/hub/protonmsg.py +++ b/plugins/hub/protonmsg.py @@ -5,6 +5,7 @@ # Authors: # Mike Bonnet +from __future__ import absolute_import import koji from koji.plugin import callback, ignore_error, convert_datetime from koji.context import context diff --git a/plugins/hub/rpm2maven.py b/plugins/hub/rpm2maven.py index ad78b8fe..111e0720 100644 --- a/plugins/hub/rpm2maven.py +++ b/plugins/hub/rpm2maven.py @@ -5,6 +5,7 @@ # Authors: # Mike Bonnet +from __future__ import absolute_import import koji from koji.context import context from koji.plugin import callback diff --git a/plugins/hub/runroot_hub.py b/plugins/hub/runroot_hub.py index e6ee0b35..708aede7 100644 --- a/plugins/hub/runroot_hub.py +++ b/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 diff --git a/plugins/hub/save_failed_tree.py b/plugins/hub/save_failed_tree.py index 5b34c2d9..2f40ead1 100644 --- a/plugins/hub/save_failed_tree.py +++ b/plugins/hub/save_failed_tree.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import sys import ConfigParser import koji diff --git a/setup.py b/setup.py index d51a4281..13f8f41f 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import sys from setuptools import setup diff --git a/tests/test_cli/data/plugins/plugin1.py b/tests/test_cli/data/plugins/plugin1.py index 3e405f54..41d876e2 100644 --- a/tests/test_cli/data/plugins/plugin1.py +++ b/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') diff --git a/tests/test_cli/fakeclient.py b/tests/test_cli/fakeclient.py index 6c652c87..d0b07d0f 100644 --- a/tests/test_cli/fakeclient.py +++ b/tests/test_cli/fakeclient.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock import koji diff --git a/tests/test_cli/test_activate_session.py b/tests/test_cli/test_activate_session.py index a97e6f82..707d43d4 100644 --- a/tests/test_cli/test_activate_session.py +++ b/tests/test_cli/test_activate_session.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock import shutil import tempfile diff --git a/tests/test_cli/test_list_notifications.py b/tests/test_cli/test_list_notifications.py index ca173b9c..53893d34 100644 --- a/tests/test_cli/test_list_notifications.py +++ b/tests/test_cli/test_list_notifications.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_cli/test_list_tasks.py b/tests/test_cli/test_list_tasks.py index 497a7999..8daebc1a 100644 --- a/tests/test_cli/test_list_tasks.py +++ b/tests/test_cli/test_list_tasks.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock import six try: diff --git a/tests/test_cli/utils.py b/tests/test_cli/utils.py index 2e243ed8..1523ed2c 100644 --- a/tests/test_cli/utils.py +++ b/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 diff --git a/tests/test_docs_version.py b/tests/test_docs_version.py index db8e617a..e53c7f3a 100644 --- a/tests/test_docs_version.py +++ b/tests/test_docs_version.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import os import subprocess try: diff --git a/tests/test_hub/test_add_btype.py b/tests/test_hub/test_add_btype.py index eef3d2d9..64f19e1d 100644 --- a/tests/test_hub/test_add_btype.py +++ b/tests/test_hub/test_add_btype.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import try: import unittest2 as unittest except ImportError: diff --git a/tests/test_hub/test_add_external_rpm.py b/tests/test_hub/test_add_external_rpm.py index 874aff1c..a869256e 100644 --- a/tests/test_hub/test_add_external_rpm.py +++ b/tests/test_hub/test_add_external_rpm.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_add_host.py b/tests/test_hub/test_add_host.py index 34c51b1b..3746b2e5 100644 --- a/tests/test_hub/test_add_host.py +++ b/tests/test_hub/test_add_host.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_add_host_to_channel.py b/tests/test_hub/test_add_host_to_channel.py index 3ca10369..68f2fc43 100644 --- a/tests/test_hub/test_add_host_to_channel.py +++ b/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 diff --git a/tests/test_hub/test_apply_query_opts.py b/tests/test_hub/test_apply_query_opts.py index 8e780909..d8652d6b 100644 --- a/tests/test_hub/test_apply_query_opts.py +++ b/tests/test_hub/test_apply_query_opts.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import copy try: import unittest2 as unittest diff --git a/tests/test_hub/test_cg_importer.py b/tests/test_hub/test_cg_importer.py index 8c825517..032658cf 100644 --- a/tests/test_hub/test_cg_importer.py +++ b/tests/test_hub/test_cg_importer.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock import os import shutil diff --git a/tests/test_hub/test_check_volume_policy.py b/tests/test_hub/test_check_volume_policy.py index 8271cec2..9531d280 100644 --- a/tests/test_hub/test_check_volume_policy.py +++ b/tests/test_hub/test_check_volume_policy.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_complete_image_build.py b/tests/test_hub/test_complete_image_build.py index 646032ae..1bdde53b 100644 --- a/tests/test_hub/test_complete_image_build.py +++ b/tests/test_hub/test_complete_image_build.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import copy import json import mock diff --git a/tests/test_hub/test_complete_maven_build.py b/tests/test_hub/test_complete_maven_build.py index 2bd74199..42ba1612 100644 --- a/tests/test_hub/test_complete_maven_build.py +++ b/tests/test_hub/test_complete_maven_build.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import copy import json import mock diff --git a/tests/test_hub/test_create_tag.py b/tests/test_hub/test_create_tag.py index d0a3765e..f4832110 100644 --- a/tests/test_hub/test_create_tag.py +++ b/tests/test_hub/test_create_tag.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import copy import mock import shutil diff --git a/tests/test_hub/test_delete_build.py b/tests/test_hub/test_delete_build.py index c46207bd..d4b79f86 100644 --- a/tests/test_hub/test_delete_build.py +++ b/tests/test_hub/test_delete_build.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_delete_tag.py b/tests/test_hub/test_delete_tag.py index 832cecea..ef182d88 100644 --- a/tests/test_hub/test_delete_tag.py +++ b/tests/test_hub/test_delete_tag.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_dist_repo.py b/tests/test_hub/test_dist_repo.py index 272b3f55..e0637b17 100644 --- a/tests/test_hub/test_dist_repo.py +++ b/tests/test_hub/test_dist_repo.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import try: import unittest2 as unittest except ImportError: diff --git a/tests/test_hub/test_edit_host.py b/tests/test_hub/test_edit_host.py index 8b815477..a4b61d34 100644 --- a/tests/test_hub/test_edit_host.py +++ b/tests/test_hub/test_edit_host.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_edit_tag.py b/tests/test_hub/test_edit_tag.py index e011267d..cb320590 100644 --- a/tests/test_hub/test_edit_tag.py +++ b/tests/test_hub/test_edit_tag.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_get_active_repos.py b/tests/test_hub/test_get_active_repos.py index eb67a57f..54db43d7 100644 --- a/tests/test_hub/test_get_active_repos.py +++ b/tests/test_hub/test_get_active_repos.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_get_archive_file.py b/tests/test_hub/test_get_archive_file.py index b3a4b9b3..cec5ef00 100644 --- a/tests/test_hub/test_get_archive_file.py +++ b/tests/test_hub/test_get_archive_file.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_get_build_logs.py b/tests/test_hub/test_get_build_logs.py index f0b8ebc9..c03ff298 100644 --- a/tests/test_hub/test_get_build_logs.py +++ b/tests/test_hub/test_get_build_logs.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock import os import shutil diff --git a/tests/test_hub/test_get_build_type.py b/tests/test_hub/test_get_build_type.py index 7cd03f1f..325386cd 100644 --- a/tests/test_hub/test_get_build_type.py +++ b/tests/test_hub/test_get_build_type.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_get_host.py b/tests/test_hub/test_get_host.py index f5ea774d..420e7e22 100644 --- a/tests/test_hub/test_get_host.py +++ b/tests/test_hub/test_get_host.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_get_next_release.py b/tests/test_hub/test_get_next_release.py index 7b69decf..15788999 100644 --- a/tests/test_hub/test_get_next_release.py +++ b/tests/test_hub/test_get_next_release.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_get_upload_path.py b/tests/test_hub/test_get_upload_path.py index 9958f27a..374b968d 100644 --- a/tests/test_hub/test_get_upload_path.py +++ b/tests/test_hub/test_get_upload_path.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import os import mock import shutil diff --git a/tests/test_hub/test_get_user_perms.py b/tests/test_hub/test_get_user_perms.py index ffad7337..81ff47da 100644 --- a/tests/test_hub/test_get_user_perms.py +++ b/tests/test_hub/test_get_user_perms.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_get_verify_class.py b/tests/test_hub/test_get_verify_class.py index 84adc82c..721c9927 100644 --- a/tests/test_hub/test_get_verify_class.py +++ b/tests/test_hub/test_get_verify_class.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import try: import unittest2 as unittest except ImportError: diff --git a/tests/test_hub/test_group_operations.py b/tests/test_hub/test_group_operations.py index 90b525e4..aee0095d 100644 --- a/tests/test_hub/test_group_operations.py +++ b/tests/test_hub/test_group_operations.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_import_build.py b/tests/test_hub/test_import_build.py index 783eea07..22f1186c 100644 --- a/tests/test_hub/test_import_build.py +++ b/tests/test_hub/test_import_build.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import copy import mock import shutil diff --git a/tests/test_hub/test_import_image_internal.py b/tests/test_hub/test_import_image_internal.py index 62ad1081..2527d4d7 100644 --- a/tests/test_hub/test_import_image_internal.py +++ b/tests/test_hub/test_import_image_internal.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock import os import shutil diff --git a/tests/test_hub/test_insert_processor.py b/tests/test_hub/test_insert_processor.py index b661bf5f..bd0a5ee5 100644 --- a/tests/test_hub/test_insert_processor.py +++ b/tests/test_hub/test_insert_processor.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_list_archive_files.py b/tests/test_hub/test_list_archive_files.py index 46d95d96..a8bcc63f 100644 --- a/tests/test_hub/test_list_archive_files.py +++ b/tests/test_hub/test_list_archive_files.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_list_archives.py b/tests/test_hub/test_list_archives.py index 677755d5..1f529ee6 100644 --- a/tests/test_hub/test_list_archives.py +++ b/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 diff --git a/tests/test_hub/test_list_btypes.py b/tests/test_hub/test_list_btypes.py index 147444b2..512a6729 100644 --- a/tests/test_hub/test_list_btypes.py +++ b/tests/test_hub/test_list_btypes.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_list_channels.py b/tests/test_hub/test_list_channels.py index 3746b861..595e05a2 100644 --- a/tests/test_hub/test_list_channels.py +++ b/tests/test_hub/test_list_channels.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_list_hosts.py b/tests/test_hub/test_list_hosts.py index e13e38fd..60161e70 100644 --- a/tests/test_hub/test_list_hosts.py +++ b/tests/test_hub/test_list_hosts.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_list_task_output.py b/tests/test_hub/test_list_task_output.py index 7da39ea4..4a5bcd32 100644 --- a/tests/test_hub/test_list_task_output.py +++ b/tests/test_hub/test_list_task_output.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_listing.py b/tests/test_hub/test_listing.py index 9587fd13..b622be02 100644 --- a/tests/test_hub/test_listing.py +++ b/tests/test_hub/test_listing.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_models/test_host.py b/tests/test_hub/test_models/test_host.py index e94ac0d8..1a39a2e9 100644 --- a/tests/test_hub/test_models/test_host.py +++ b/tests/test_hub/test_models/test_host.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_new_typed_build.py b/tests/test_hub/test_new_typed_build.py index f93f84ef..a0e93ba3 100644 --- a/tests/test_hub/test_new_typed_build.py +++ b/tests/test_hub/test_new_typed_build.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_notifications.py b/tests/test_hub/test_notifications.py index 269ef8a6..0cea57c6 100644 --- a/tests/test_hub/test_notifications.py +++ b/tests/test_hub/test_notifications.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_pkglist.py b/tests/test_hub/test_pkglist.py index 1dfe6d4f..731abb67 100644 --- a/tests/test_hub/test_pkglist.py +++ b/tests/test_hub/test_pkglist.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_policy_tests.py b/tests/test_hub/test_policy_tests.py index 7d114fce..ad9e5c7c 100644 --- a/tests/test_hub/test_policy_tests.py +++ b/tests/test_hub/test_policy_tests.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_query_processor.py b/tests/test_hub/test_query_processor.py index 8e1464f7..b807d21a 100644 --- a/tests/test_hub/test_query_processor.py +++ b/tests/test_hub/test_query_processor.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_recycle_build.py b/tests/test_hub/test_recycle_build.py index 119814fc..d5b81c4b 100644 --- a/tests/test_hub/test_recycle_build.py +++ b/tests/test_hub/test_recycle_build.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock import koji diff --git a/tests/test_hub/test_remove_host_from_channel.py b/tests/test_hub/test_remove_host_from_channel.py index cb3d111c..db26349a 100644 --- a/tests/test_hub/test_remove_host_from_channel.py +++ b/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 diff --git a/tests/test_hub/test_repos.py b/tests/test_hub/test_repos.py index 8bda5365..670bcfa8 100644 --- a/tests/test_hub/test_repos.py +++ b/tests/test_hub/test_repos.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock import unittest diff --git a/tests/test_hub/test_rpmdiff.py b/tests/test_hub/test_rpmdiff.py index fcc1280e..c7d00f49 100644 --- a/tests/test_hub/test_rpmdiff.py +++ b/tests/test_hub/test_rpmdiff.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import copy import mock try: diff --git a/tests/test_hub/test_savepoint.py b/tests/test_hub/test_savepoint.py index 279729ef..a6987214 100644 --- a/tests/test_hub/test_savepoint.py +++ b/tests/test_hub/test_savepoint.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock import unittest diff --git a/tests/test_hub/test_set_host_enabled.py b/tests/test_hub/test_set_host_enabled.py index 698e451e..b2390802 100644 --- a/tests/test_hub/test_set_host_enabled.py +++ b/tests/test_hub/test_set_host_enabled.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_tag_operations.py b/tests/test_hub/test_tag_operations.py index fbd5cfb5..e4123894 100644 --- a/tests/test_hub/test_tag_operations.py +++ b/tests/test_hub/test_tag_operations.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import copy import mock import shutil diff --git a/tests/test_hub/test_task_wait_results.py b/tests/test_hub/test_task_wait_results.py index a4540380..327c5696 100644 --- a/tests/test_hub/test_task_wait_results.py +++ b/tests/test_hub/test_task_wait_results.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock import xmlrpclib try: diff --git a/tests/test_hub/test_update_processor.py b/tests/test_hub/test_update_processor.py index 83fcaa62..95378841 100644 --- a/tests/test_hub/test_update_processor.py +++ b/tests/test_hub/test_update_processor.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/test_user_groups.py b/tests/test_hub/test_user_groups.py index 0d06e15d..42ad16c0 100644 --- a/tests/test_hub/test_user_groups.py +++ b/tests/test_hub/test_user_groups.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_hub/utils.py b/tests/test_hub/utils.py index b1cf6354..8a4fae93 100644 --- a/tests/test_hub/utils.py +++ b/tests/test_hub/utils.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock import six try: diff --git a/tests/test_lib/test_argspec.py b/tests/test_lib/test_argspec.py index 29df33c9..a565a64b 100644 --- a/tests/test_lib/test_argspec.py +++ b/tests/test_lib/test_argspec.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import try: import unittest2 as unittest except ImportError: diff --git a/tests/test_lib/test_encode_datetime.py b/tests/test_lib/test_encode_datetime.py index 8d931df2..e2a2909f 100644 --- a/tests/test_lib/test_encode_datetime.py +++ b/tests/test_lib/test_encode_datetime.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import datetime try: import unittest2 as unittest diff --git a/tests/test_lib/test_gen_mock_config.py b/tests/test_lib/test_gen_mock_config.py index 35bae4f9..b6d822a0 100644 --- a/tests/test_lib/test_gen_mock_config.py +++ b/tests/test_lib/test_gen_mock_config.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import ast import os import os.path diff --git a/tests/test_lib_py2only/test_restart_tasks.py b/tests/test_lib_py2only/test_restart_tasks.py index ac8d1e4b..f43df038 100644 --- a/tests/test_lib_py2only/test_restart_tasks.py +++ b/tests/test_lib_py2only/test_restart_tasks.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock import shutil import tempfile diff --git a/tests/test_plugins/load_plugin.py b/tests/test_plugins/load_plugin.py index dcc3f258..ac20795d 100644 --- a/tests/test_plugins/load_plugin.py +++ b/tests/test_plugins/load_plugin.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import os import sys diff --git a/tests/test_plugins/test_protonmsg.py b/tests/test_plugins/test_protonmsg.py index ed26f64a..4572506a 100644 --- a/tests/test_plugins/test_protonmsg.py +++ b/tests/test_plugins/test_protonmsg.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import six import protonmsg import tempfile diff --git a/tests/test_plugins/test_runroot_hub.py b/tests/test_plugins/test_runroot_hub.py index 6c64f3c9..637634e3 100644 --- a/tests/test_plugins/test_runroot_hub.py +++ b/tests/test_plugins/test_runroot_hub.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mock try: import unittest2 as unittest diff --git a/tests/test_plugins/test_save_failed_tree_cli.py b/tests/test_plugins/test_save_failed_tree_cli.py index ec6fb7f1..452c7f8f 100644 --- a/tests/test_plugins/test_save_failed_tree_cli.py +++ b/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') diff --git a/tests/test_scm.py b/tests/test_scm.py index 6eb39103..c97f0577 100644 --- a/tests/test_scm.py +++ b/tests/test_scm.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import logging import mock import shutil diff --git a/tests/test_www/test_util.py b/tests/test_www/test_util.py index 0ead026b..8cc25b90 100644 --- a/tests/test_www/test_util.py +++ b/tests/test_www/test_util.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import unittest from kojiweb.util import formatMode diff --git a/vm/kojivmd b/vm/kojivmd index 983a975e..d2044b28 100755 --- a/vm/kojivmd +++ b/vm/kojivmd @@ -20,6 +20,7 @@ # Authors: # Mike Bonnet +from __future__ import absolute_import import koji import koji.util from koji.daemon import SCM, TaskManager diff --git a/www/kojiweb/wsgi_publisher.py b/www/kojiweb/wsgi_publisher.py index 36f10553..5c45cc55 100644 --- a/www/kojiweb/wsgi_publisher.py +++ b/www/kojiweb/wsgi_publisher.py @@ -19,6 +19,7 @@ # Authors: # Mike McLean +from __future__ import absolute_import import cgi import inspect import koji