diff --git a/lib/iris/tests/unit/data_manager/test_DataManager.py b/lib/iris/tests/unit/data_manager/test_DataManager.py index 1ad0ef0d9a..a0f500dc11 100644 --- a/lib/iris/tests/unit/data_manager/test_DataManager.py +++ b/lib/iris/tests/unit/data_manager/test_DataManager.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2017, Met Office +# (C) British Crown Copyright 2017 - 2018, Met Office # # This file is part of Iris. # @@ -27,13 +27,13 @@ import iris.tests as tests import copy -import mock import numpy as np import numpy.ma as ma import six from iris._data_manager import DataManager from iris._lazy_data import as_lazy_data +from iris.tests import mock class Test___copy__(tests.IrisTest): diff --git a/lib/iris/tests/unit/fileformats/dot/test__dot_path.py b/lib/iris/tests/unit/fileformats/dot/test__dot_path.py index 55c45438a6..bc19f02e7e 100644 --- a/lib/iris/tests/unit/fileformats/dot/test__dot_path.py +++ b/lib/iris/tests/unit/fileformats/dot/test__dot_path.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2016, Met Office +# (C) British Crown Copyright 2016 - 2018, Met Office # # This file is part of Iris. # @@ -26,9 +26,8 @@ import os.path import subprocess -import mock - from iris.fileformats.dot import _dot_path, _DOT_EXECUTABLE_PATH +from iris.tests import mock class Test(tests.IrisTest): diff --git a/lib/iris/tests/unit/fileformats/netcdf/test__FillValueMaskCheckAndStoreTarget.py b/lib/iris/tests/unit/fileformats/netcdf/test__FillValueMaskCheckAndStoreTarget.py index 3d2d74e869..7365e2a902 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/test__FillValueMaskCheckAndStoreTarget.py +++ b/lib/iris/tests/unit/fileformats/netcdf/test__FillValueMaskCheckAndStoreTarget.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2017, Met Office +# (C) British Crown Copyright 2017 - 2018, Met Office # # This file is part of Iris. # @@ -27,10 +27,10 @@ # importing anything else. import iris.tests as tests -import mock import numpy as np from iris.fileformats.netcdf import _FillValueMaskCheckAndStoreTarget +from iris.tests import mock class Test__FillValueMaskCheckAndStoreTarget(tests.IrisTest): diff --git a/lib/iris/tests/unit/fileformats/netcdf/test_save.py b/lib/iris/tests/unit/fileformats/netcdf/test_save.py index 1a6766c88e..06f5140058 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/test_save.py +++ b/lib/iris/tests/unit/fileformats/netcdf/test_save.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014 - 2017, Met Office +# (C) British Crown Copyright 2014 - 2018, Met Office # # This file is part of Iris. # @@ -23,7 +23,6 @@ # importing anything else. import iris.tests as tests -import mock import netCDF4 as nc import numpy as np @@ -31,6 +30,7 @@ from iris.coords import DimCoord from iris.cube import Cube, CubeList from iris.fileformats.netcdf import save, CF_CONVENTIONS_VERSION +from iris.tests import mock from iris.tests.stock import lat_lon_cube diff --git a/lib/iris/tests/unit/fileformats/rules/test_Loader.py b/lib/iris/tests/unit/fileformats/rules/test_Loader.py index a8c3d6b854..eec203e66e 100644 --- a/lib/iris/tests/unit/fileformats/rules/test_Loader.py +++ b/lib/iris/tests/unit/fileformats/rules/test_Loader.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2015 - 2017, Met Office +# (C) British Crown Copyright 2015 - 2018, Met Office # # This file is part of Iris. # @@ -23,9 +23,8 @@ # importing anything else. import iris.tests as tests -import mock - from iris.fileformats.rules import Loader +from iris.tests import mock class Test___init__(tests.IrisTest): diff --git a/lib/iris/tests/unit/fileformats/um/test_um_to_pp.py b/lib/iris/tests/unit/fileformats/um/test_um_to_pp.py index 57f3b06712..2bd932220e 100644 --- a/lib/iris/tests/unit/fileformats/um/test_um_to_pp.py +++ b/lib/iris/tests/unit/fileformats/um/test_um_to_pp.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014 - 2016, Met Office +# (C) British Crown Copyright 2014 - 2018, Met Office # # This file is part of Iris. # @@ -27,9 +27,8 @@ # before importing anything else. import iris.tests as tests -import mock - from iris.fileformats.um import um_to_pp +from iris.tests import mock class Test_call(tests.IrisTest): diff --git a/lib/iris/tests/unit/lazy_data/test_as_lazy_data.py b/lib/iris/tests/unit/lazy_data/test_as_lazy_data.py index 8cf0838280..7acb0b6284 100644 --- a/lib/iris/tests/unit/lazy_data/test_as_lazy_data.py +++ b/lib/iris/tests/unit/lazy_data/test_as_lazy_data.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2017, Met Office +# (C) British Crown Copyright 2017 - 2018, Met Office # # This file is part of Iris. # @@ -23,13 +23,12 @@ # importing anything else. import iris.tests as tests -import mock - import dask.array as da import numpy as np import numpy.ma as ma from iris._lazy_data import as_lazy_data, _MAX_CHUNK_SIZE, _limited_shape +from iris.tests import mock class Test_as_lazy_data(tests.IrisTest): diff --git a/lib/iris/tests/unit/test_sample_data_path.py b/lib/iris/tests/unit/test_sample_data_path.py index a941543151..af2730ac2c 100644 --- a/lib/iris/tests/unit/test_sample_data_path.py +++ b/lib/iris/tests/unit/test_sample_data_path.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2016 - 2017, Met Office +# (C) British Crown Copyright 2016 - 2018, Met Office # # This file is part of Iris. # @@ -28,9 +28,8 @@ import shutil import tempfile -import mock - from iris import sample_data_path +from iris.tests import mock def _temp_file(sample_dir):