prefer newer unittest.mock from the standard library when available

influxdb/tests/client_test.py

@@ -27,7 +27,10 @@
 import io
 import gzip
 import json
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import requests
 import requests.exceptions
 import requests_mock

influxdb/tests/helper_test.py

@@ -11,7 +11,10 @@
 import unittest
 import warnings
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 from influxdb import SeriesHelper, InfluxDBClient
 from requests.exceptions import ConnectionError
 

influxdb/tests/influxdb08/client_test.py

@@ -8,7 +8,10 @@
 import random
 import warnings
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import requests
 import requests.exceptions
 import requests_mock

influxdb/tests/influxdb08/helper_test.py

@@ -4,7 +4,10 @@
 import unittest
 import warnings
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 from influxdb.influxdb08 import SeriesHelper, InfluxDBClient
 from requests.exceptions import ConnectionError