#4239 unittest: use unittest.mock instead of mock
Merged 4 months ago by mikem. Opened 4 months ago by julian8628.
julian8628/koji unittest-mock  into  master

@@ -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

  

@@ -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

  

@@ -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):

@@ -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

@@ -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

@@ -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

  

@@ -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__)

  

file modified
+4 -1
@@ -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

@@ -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

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

  

  import unittest

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  

  import koji

@@ -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

@@ -1,6 +1,9 @@ 

  from __future__ import absolute_import

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import unittest

  

@@ -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

@@ -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

@@ -1,6 +1,9 @@ 

  from __future__ import absolute_import

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  

  import koji

@@ -1,6 +1,9 @@ 

  from __future__ import absolute_import

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import unittest

  

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import unittest

  

@@ -1,6 +1,9 @@ 

  from __future__ import absolute_import

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import koji

  

@@ -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

@@ -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

@@ -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

@@ -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

  

file modified
+4 -1
@@ -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

@@ -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

file modified
+4 -1
@@ -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

@@ -1,6 +1,9 @@ 

  from __future__ import absolute_import

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  

  import koji

  import six

@@ -1,6 +1,9 @@ 

  from __future__ import absolute_import

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import unittest

  

@@ -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

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

  

  import unittest

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  

  import koji

@@ -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

  

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import unittest

  

@@ -4,7 +4,10 @@ 

  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

@@ -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

@@ -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

@@ -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

@@ -2,10 +2,14 @@ 

  

  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

@@ -3,7 +3,10 @@ 

  

  import unittest

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  

  import koji

  from koji_cli.commands import handle_edit_channel

@@ -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

  

@@ -1,11 +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_edit_host

  from . import utils

  

@@ -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

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import koji

  import six

  

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import koji

  

@@ -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

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

  

  import copy

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  from six.moves import StringIO

  

  import koji

@@ -3,7 +3,10 @@ 

  import unittest

  

  import six

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import koji

  

  

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

  

  import unittest

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import koji

  

@@ -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

  

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import unittest

  import koji

  

@@ -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

@@ -1,6 +1,9 @@ 

  from __future__ import absolute_import

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import optparse

  

  import koji

@@ -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

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import unittest

  import koji

  

file modified
+4 -1
@@ -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

  

@@ -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

@@ -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

@@ -3,7 +3,10 @@ 

  import os

  import unittest

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  

  import koji

@@ -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

@@ -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

@@ -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):

@@ -7,7 +7,10 @@ 

  import pytest

  import koji

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  

  try:

@@ -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

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

  

  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

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import unittest

  

@@ -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

@@ -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

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

  

  import unittest

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  from six.moves import StringIO

  

  import koji

@@ -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

@@ -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

@@ -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

@@ -7,7 +7,10 @@ 

  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

@@ -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

@@ -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

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import unittest

  

@@ -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

@@ -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

  

@@ -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

@@ -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

@@ -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

@@ -4,7 +4,10 @@ 

  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

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

  

  import unittest

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  

  import koji

@@ -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

  

@@ -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

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import unittest

  

@@ -4,7 +4,10 @@ 

  

  import unittest

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  

  from . import loadcli

  

@@ -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

@@ -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

@@ -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

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import unittest

  

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

  

  import unittest

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import koji

  

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

  

  import unittest

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  

  from koji_cli.commands import handle_move_build

@@ -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

@@ -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

@@ -4,7 +4,10 @@ 

  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

@@ -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_remove_external_repo

@@ -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_remove_group

@@ -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 sys

@@ -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

@@ -1,13 +1,16 @@ 

  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

- from mock import call

  

  from koji_cli.commands import handle_remove_pkg

- 

  import koji

  from . import utils

  

@@ -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_remove_sig

@@ -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

@@ -1,7 +1,11 @@ 

  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_remove_tag_inheritance

@@ -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

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

  

  import unittest

  

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import shutil

  import six

  import tempfile

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import unittest

  

@@ -1,6 +1,9 @@ 

  from __future__ import absolute_import

  from __future__ import print_function

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import unittest

  

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try:

+     from unittest import mock

+ except ImportError:

+     import mock

  import six

  import unittest

  

@@ -1,5 +1,8 @@ 

  from __future__ import absolute_import

- import mock

+ try: