unittest: use unittest.mock instead of mock

because the absence of unittest.mock on python2.7, we still fallback to
mock

tests/test_builder/test_build_notification.py

@@ -1,13 +1,14 @@
 from __future__ import absolute_import
 
-import json
 import locale
 import os
 import tempfile
 import time
 import unittest
-
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import shutil
 import six
 

tests/test_builder/test_buildroot_logs.py

@@ -1,13 +1,13 @@
 from __future__ import absolute_import
 import logging
-import mock
 import os
 import shutil
 import tempfile
 import unittest
-
-import koji.daemon
-import koji
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from .loadkojid import kojid
 

tests/test_builder/test_choose_taskarch.py

@@ -1,12 +1,18 @@
 from __future__ import absolute_import
-import mock
-import rpm
-import shutil
+
 import tempfile
 import unittest
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+import rpm
+import shutil
+from six.moves import range
+
 import koji
 from .loadkojid import kojid
-from six.moves import range
 
 
 class FakeHeader(dict):

tests/test_builder/test_get_next_task.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
-import mock
 import unittest
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import koji.daemon
 import koji

tests/test_builder/test_main.py

@@ -1,8 +1,10 @@
 from __future__ import absolute_import
-import mock
 import signal
 import unittest
-from six.moves import range
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import koji
 from .loadkojid import kojid

tests/test_builder/test_taskparams.py

@@ -1,8 +1,12 @@
 from __future__ import absolute_import
 import inspect
-import mock
 import sys
 import unittest
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import koji
 import koji.tasks
 

tests/test_builder/test_volume_id.py

@@ -1,10 +1,16 @@
 from __future__ import absolute_import
-import mock
-import shutil
+import logging
 import tempfile
 import unittest
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+import shutil
+
 from .loadkojid import kojid
-import logging
+
 
 logger = logging.getLogger(__name__)
 

tests/test_cli/fakeclient.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import koji
 
 from koji.xmlrpcplus import Fault

tests/test_cli/test_activate_session.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import shutil
 import tempfile
 import unittest

tests/test_cli/test_add_channel.py

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

tests/test_cli/test_add_external_repo.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 
 from koji_cli.commands import handle_add_external_repo

tests/test_cli/test_add_group.py

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

tests/test_cli/test_add_group_pkg.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import unittest
 
 from koji_cli.commands import handle_add_group_pkg

tests/test_cli/test_add_group_req.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import unittest
 
 from koji_cli.commands import handle_add_group_req

tests/test_cli/test_add_host.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 
 import koji

tests/test_cli/test_add_host_to_channel.py

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

tests/test_cli/test_add_notification.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 import koji
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 from six.moves import StringIO
 
 from koji_cli.commands import handle_add_notification

tests/test_cli/test_add_pkg.py

@@ -1,11 +1,15 @@
 from __future__ import absolute_import
 
 import unittest
+try:
+    from unittest import mock
+    from unittest.mock import call
+except ImportError:
+    import mock
+    from mock import call
 
-import mock
 import six
 import koji
-from mock import call
 
 from koji_cli.commands import handle_add_pkg
 from . import utils

tests/test_cli/test_add_tag.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import unittest
 
 from koji_cli.commands import handle_add_tag

tests/test_cli/test_add_tag_inheritance.py

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

tests/test_cli/test_add_target.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import koji
 from koji_cli.commands import handle_add_target

tests/test_cli/test_add_user.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import unittest
 import koji

tests/test_cli/test_add_volume.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import unittest
 import koji

tests/test_cli/test_assign_task.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import unittest
 

tests/test_cli/test_block_group.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import koji
 

tests/test_cli/test_block_group_pkg.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import unittest
 
 from koji_cli.commands import handle_block_group_pkg

tests/test_cli/test_block_group_req.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import unittest
 
 from koji_cli.commands import handle_block_group_req

tests/test_cli/test_block_notification.py

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

tests/test_cli/test_block_pkg.py

@@ -1,11 +1,14 @@
 from __future__ import absolute_import
+try:
+    from unittest import mock
+    from unittest.mock import call
+except ImportError:
+    import mock
+    from mock import call
 
-import mock
 import six
-from mock import call
 
 from koji_cli.commands import handle_block_pkg
-
 import koji
 from . import utils
 

tests/test_cli/test_build.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 
 from koji_cli.commands import handle_build, _progress_callback

tests/test_cli/test_buildinfo.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 import koji
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os
 import time
 import copy

tests/test_cli/test_call.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 import json
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import unittest
 import koji

tests/test_cli/test_cancel.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import koji
 import six

tests/test_cli/test_chain_build.py

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

tests/test_cli/test_clone_tag.py

@@ -1,12 +1,15 @@
 from __future__ import absolute_import
-
-import mock
 import os
-import six
 import time
-from mock import call
-
 import unittest
+try:
+    from unittest import mock
+    from unittest.mock import call
+except ImportError:
+    import mock
+    from mock import call
+
+import six
 
 import koji
 from koji_cli.commands import handle_clone_tag

tests/test_cli/test_disable_channel.py

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

tests/test_cli/test_disable_host.py

@@ -1,9 +1,14 @@
 from __future__ import absolute_import
-import mock
-import six
 import unittest
+try:
+    from unittest import mock
+    from unittest.mock import call
+except ImportError:
+    import mock
+    from mock import call
+
+import six
 
-from mock import call
 from koji_cli.commands import handle_disable_host
 from . import utils
 

tests/test_cli/test_disable_user.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import unittest
 

tests/test_cli/test_dist_repo.py

@@ -4,7 +4,10 @@ from __future__ import print_function
 import unittest
 import copy
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 
 from koji_cli.commands import handle_dist_repo

tests/test_cli/test_download_build.py

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

tests/test_cli/test_download_file.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import shutil
 import tempfile

tests/test_cli/test_download_logs.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 
 from koji_cli.commands import anon_handle_download_logs

tests/test_cli/test_download_task.py

@@ -2,10 +2,14 @@ from __future__ import absolute_import
 
 import os
 import sys
+try:
+    from unittest import mock
+    from unittest.mock import call
+except ImportError:
+    import mock
+    from mock import call
 
-import mock
 import six
-from mock import call
 
 from koji_cli.commands import anon_handle_download_task
 from . import utils

tests/test_cli/test_edit_channel.py

@@ -3,7 +3,10 @@ from __future__ import absolute_import
 
 import unittest
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import koji
 from koji_cli.commands import handle_edit_channel

tests/test_cli/test_edit_external_repo.py

@@ -1,6 +1,9 @@
 # coding=utf-8
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import unittest
 

tests/test_cli/test_edit_host.py

@@ -1,11 +1,15 @@
 from __future__ import absolute_import
-import mock
-import six
 import unittest
+try:
+    from unittest import mock
+    from unittest.mock import call
+except ImportError:
+    import mock
+    from mock import call
+
+import six
+
 import koji
-
-from mock import call
-
 from koji_cli.commands import handle_edit_host
 from . import utils
 

tests/test_cli/test_edit_notification.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 import koji
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from koji_cli.commands import handle_edit_notification
 from . import utils

tests/test_cli/test_edit_permission.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import koji
 import six
 

tests/test_cli/test_edit_tag.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import koji
 

tests/test_cli/test_edit_tag_inheritance.py

@@ -1,7 +1,10 @@
 from __future__ import absolute_import
-
-import mock
-from mock import call
+try:
+    from unittest import mock
+    from unittest.mock import call
+except ImportError:
+    import mock
+    from mock import call
 
 import koji
 from koji_cli.commands import handle_edit_tag_inheritance

tests/test_cli/test_edit_target.py

@@ -2,7 +2,10 @@ from __future__ import absolute_import
 
 import copy
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 from six.moves import StringIO
 
 import koji

tests/test_cli/test_edit_user.py

@@ -3,7 +3,10 @@ from __future__ import absolute_import
 import unittest
 
 import six
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import koji
 
 

tests/test_cli/test_enable_channel.py

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

tests/test_cli/test_enable_host.py

@@ -1,10 +1,15 @@
 from __future__ import absolute_import
-import mock
-import six
 import unittest
-import koji
+try:
+    from unittest import mock
+    from unittest.mock import call
+except ImportError:
+    import mock
+    from mock import call
 
-from mock import call
+import six
+
+import koji
 from koji_cli.commands import handle_enable_host
 from . import utils
 

tests/test_cli/test_enable_user.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import unittest
 import koji
 

tests/test_cli/test_free_task.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 from six.moves import StringIO
 
 from koji_cli.commands import handle_free_task

tests/test_cli/test_get_options.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import optparse
 
 import koji

tests/test_cli/test_grant_cg_access.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import unittest
 
 from koji_cli.commands import handle_grant_cg_access

tests/test_cli/test_grant_permission.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import unittest
 import koji
 

tests/test_cli/test_hello.py

@@ -1,6 +1,9 @@
 # coding=utf-8
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import unittest
 

tests/test_cli/test_hostinfo.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os
 import time
 import locale

tests/test_cli/test_image_build.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import os
 import unittest

tests/test_cli/test_image_build_indirection.py

@@ -3,7 +3,10 @@ from __future__ import absolute_import
 import os
 import unittest
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 
 import koji

tests/test_cli/test_import.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os
 import six
 import unittest

tests/test_cli/test_import_archive.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import koji
 from koji_cli.commands import handle_import_archive

tests/test_cli/test_import_cg.py

@@ -1,15 +1,18 @@
 from __future__ import absolute_import
-import mock
+import os
+import unittest
+try:
+    from unittest import mock
+    from unittest.mock import call
+except ImportError:
+    import mock
+    from mock import call
+
 import six
 
-from mock import call
 from koji_cli.commands import handle_import_cg
 from . import utils
 
-import os
-
-import unittest
-
 
 class TestImportCG(utils.CliTestCase):
     def mock_os_path_exists(self, filepath):

tests/test_cli/test_import_comps.py

@@ -7,7 +7,10 @@ import json
 import pytest
 import koji
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 
 try:

tests/test_cli/test_import_sig.py

@@ -1,13 +1,18 @@
 from __future__ import absolute_import
 import copy
 import hashlib
-import mock
+import unittest
+try:
+    from unittest import mock
+    from unittest.mock import call
+except ImportError:
+    import mock
+    from mock import call
 import random
+
 import six
 from six.moves import range
-import unittest
 
-from mock import call
 from koji.util import base64encode
 from koji_cli.commands import handle_import_sig
 from . import utils

tests/test_cli/test_latest_build.py

@@ -2,7 +2,10 @@ from __future__ import absolute_import
 
 import unittest
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from koji_cli.commands import anon_handle_latest_build
 from . import utils

tests/test_cli/test_list_api.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import unittest
 

tests/test_cli/test_list_buildroot.py

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

tests/test_cli/test_list_builds.py

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

tests/test_cli/test_list_channels.py

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

tests/test_cli/test_list_commands.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os
 import six
 import unittest

tests/test_cli/test_list_external_repos.py

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

tests/test_cli/test_list_groups.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import time
 import unittest

tests/test_cli/test_list_history.py

@@ -7,7 +7,10 @@ from dateutil.tz import tzutc
 import unittest
 
 from six.moves import StringIO
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import koji
 from koji_cli.commands import anon_handle_list_history

tests/test_cli/test_list_hosts.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os
 import time
 import locale

tests/test_cli/test_list_notifications.py

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

tests/test_cli/test_list_permissions.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import unittest
 

tests/test_cli/test_list_pkgs.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import copy
 import os
 import time

tests/test_cli/test_list_signed.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 from six.moves import StringIO
 import koji
 

tests/test_cli/test_list_tag_inheritance.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import koji
 from koji_cli.commands import anon_handle_list_tag_inheritance

tests/test_cli/test_list_tagged.py

@@ -1,7 +1,10 @@
 import os
 import time
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 
 from koji_cli.commands import anon_handle_list_tagged

tests/test_cli/test_list_tags.py

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

tests/test_cli/test_list_targets.py

@@ -4,7 +4,10 @@ import time
 from optparse import Values
 
 import six
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import koji
 from koji_cli.commands import anon_handle_list_targets

tests/test_cli/test_list_tasks.py

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

tests/test_cli/test_list_untagged.py

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

tests/test_cli/test_list_users.py

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

tests/test_cli/test_list_volumes.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import unittest
 

tests/test_cli/test_load_plugins.py

@@ -4,7 +4,10 @@ import os
 
 import unittest
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from . import loadcli
 

tests/test_cli/test_lock_tag.py

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

tests/test_cli/test_make_task.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 import koji
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 from six.moves import StringIO
 
 from koji_cli.commands import handle_make_task

tests/test_cli/test_maven_build.py

@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import optparse
 import os
 import six

tests/test_cli/test_maven_chain.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import unittest
 

tests/test_cli/test_mock_config.py

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

tests/test_cli/test_move_build.py

@@ -2,7 +2,10 @@ from __future__ import absolute_import
 
 import unittest
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 
 from koji_cli.commands import handle_move_build

tests/test_cli/test_promote_build.py

@@ -1,7 +1,10 @@
 from __future__ import absolute_import
 import koji
 import locale
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os
 import time
 from six.moves import StringIO

tests/test_cli/test_prune_signed_copies.py

@@ -1,7 +1,10 @@
 from __future__ import absolute_import
 
 import koji
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os
 import six
 import time

tests/test_cli/test_regen_repo.py

@@ -4,7 +4,10 @@ from __future__ import print_function
 import unittest
 import copy
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 
 from koji_cli.commands import handle_regen_repo