Update: unittest extension for python 3.x

fire/core_test.py

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

fire/fire_import_test.py

@@ -18,7 +18,10 @@
 
 import fire
 from fire import testutils
-import mock
+try:
+  import mock  # python 2.x
+except ModuleNotFoundError:
+  from unittest import mock  # python 3.x
 
 
 class FireImportTest(testutils.BaseTestCase):

fire/fire_test.py

@@ -25,7 +25,10 @@
 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
 
 

fire/interact_test.py

@@ -21,7 +21,10 @@
 from fire import interact
 from fire import testutils
 
-import mock
+try:
+  import mock  # python 2.x
+except ModuleNotFoundError:
+  from unittest import mock  # python 3.x
 
 
 try:

fire/testutils.py

@@ -26,7 +26,10 @@
 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