Index: fire-0.5.0/fire/core_test.py =================================================================== --- fire-0.5.0.orig/fire/core_test.py +++ fire-0.5.0/fire/core_test.py @@ -22,7 +22,11 @@ from fire import core from fire import test_components as tc from fire import testutils from fire import trace -import mock + +try: + import mock # python 2.x +except ModuleNotFoundError: + from unittest import mock # python 3.x import six Index: fire-0.5.0/fire/fire_import_test.py =================================================================== --- fire-0.5.0.orig/fire/fire_import_test.py +++ fire-0.5.0/fire/fire_import_test.py @@ -18,7 +18,10 @@ import sys import fire from fire import testutils -import mock +try: + from unittest import mock +except ImportError: + import mock class FireImportTest(testutils.BaseTestCase): Index: fire-0.5.0/fire/fire_test.py =================================================================== --- fire-0.5.0.orig/fire/fire_test.py +++ fire-0.5.0/fire/fire_test.py @@ -25,7 +25,10 @@ import fire from fire import test_components as tc from fire import testutils -import mock +try: + import mock # python 2.x +except ModuleNotFoundError: + from unittest import mock # python 3.x import six Index: fire-0.5.0/fire/interact_test.py =================================================================== --- fire-0.5.0.orig/fire/interact_test.py +++ fire-0.5.0/fire/interact_test.py @@ -21,7 +21,10 @@ from __future__ import print_function from fire import interact from fire import testutils -import mock +try: + from unittest import mock +except ImportError: + import mock try: Index: fire-0.5.0/fire/testutils.py =================================================================== --- fire-0.5.0.orig/fire/testutils.py +++ fire-0.5.0/fire/testutils.py @@ -27,7 +27,10 @@ import unittest from fire import core from fire import trace -import mock +try: + import mock # python 2.x +except ModuleNotFoundError: + from unittest import mock # python 3.x import six