prefer newer unittest.mock from the standad library

tests/ansible/tests/connection_test.py

@@ -2,7 +2,11 @@ from __future__ import absolute_import
 import os
 import tempfile
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import ansible.errors
 import ansible.playbook.play_context
 

tests/ansible/tests/target_test.py

@@ -4,7 +4,10 @@ import subprocess
 import tempfile
 import unittest
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import ansible_mitogen.target
 import testlib

tests/broker_test.py

@@ -1,4 +1,7 @@
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import testlib
 

tests/importer_test.py

@@ -4,7 +4,10 @@ import types
 import zlib
 import unittest
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import mitogen.core
 import mitogen.utils

tests/io_op_test.py

@@ -1,7 +1,10 @@
 import errno
 import select
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import testlib
 import mitogen.core

tests/log_handler_test.py

@@ -1,8 +1,12 @@
 import logging
-import mock
 import sys
 import unittest
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import testlib
 import mitogen.core
 import mitogen.master

tests/message_test.py

@@ -2,7 +2,10 @@ import sys
 import struct
 import unittest
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import mitogen.core
 import mitogen.master

tests/mitogen_protocol_test.py

@@ -1,4 +1,7 @@
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import mitogen.core
 

tests/parent_test.py

@@ -6,7 +6,10 @@ import sys
 import time
 import unittest
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import testlib
 
 import mitogen.core

tests/policy_function_test.py

@@ -1,4 +1,7 @@
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import mitogen.core
 import mitogen.parent

tests/reaper_test.py

@@ -1,7 +1,10 @@
 import signal
 
 import testlib
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import mitogen.parent
 

tests/responder_test.py

@@ -1,9 +1,13 @@
-import mock
 import textwrap
 import subprocess
 import sys
 import unittest
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import mitogen.master
 import testlib
 

tests/timer_test.py

@@ -1,4 +1,7 @@
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 import mitogen.core
 import mitogen.parent