diff --git a/docs/iris/example_tests/__init__.py b/docs/iris/example_tests/__init__.py index 8a8708c0fb..12f46ffdac 100644 --- a/docs/iris/example_tests/__init__.py +++ b/docs/iris/example_tests/__init__.py @@ -4,5 +4,4 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/docs/iris/example_tests/extest_util.py b/docs/iris/example_tests/extest_util.py index 7e791ecfac..f069f03aae 100644 --- a/docs/iris/example_tests/extest_util.py +++ b/docs/iris/example_tests/extest_util.py @@ -10,7 +10,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import contextlib diff --git a/docs/iris/example_tests/test_COP_1d_plot.py b/docs/iris/example_tests/test_COP_1d_plot.py index b303b88821..1921d440c2 100644 --- a/docs/iris/example_tests/test_COP_1d_plot.py +++ b/docs/iris/example_tests/test_COP_1d_plot.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_COP_maps.py b/docs/iris/example_tests/test_COP_maps.py index 16d26ac6e4..353e47ae0c 100644 --- a/docs/iris/example_tests/test_COP_maps.py +++ b/docs/iris/example_tests/test_COP_maps.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_SOI_filtering.py b/docs/iris/example_tests/test_SOI_filtering.py index f649b0b184..a4de5350c8 100644 --- a/docs/iris/example_tests/test_SOI_filtering.py +++ b/docs/iris/example_tests/test_SOI_filtering.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_TEC.py b/docs/iris/example_tests/test_TEC.py index 392f8890b0..568810919c 100644 --- a/docs/iris/example_tests/test_TEC.py +++ b/docs/iris/example_tests/test_TEC.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_anomaly_log_colouring.py b/docs/iris/example_tests/test_anomaly_log_colouring.py index 614151f469..ea7a6d3ee4 100644 --- a/docs/iris/example_tests/test_anomaly_log_colouring.py +++ b/docs/iris/example_tests/test_anomaly_log_colouring.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_atlantic_profiles.py b/docs/iris/example_tests/test_atlantic_profiles.py index fc1a5ae0cf..7622e3df69 100644 --- a/docs/iris/example_tests/test_atlantic_profiles.py +++ b/docs/iris/example_tests/test_atlantic_profiles.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_coriolis_plot.py b/docs/iris/example_tests/test_coriolis_plot.py index d92808072e..fc8b15ecea 100644 --- a/docs/iris/example_tests/test_coriolis_plot.py +++ b/docs/iris/example_tests/test_coriolis_plot.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_cross_section.py b/docs/iris/example_tests/test_cross_section.py index 6b7c203170..62adb1075a 100644 --- a/docs/iris/example_tests/test_cross_section.py +++ b/docs/iris/example_tests/test_cross_section.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_custom_aggregation.py b/docs/iris/example_tests/test_custom_aggregation.py index a6c44681ae..0bc4ed4397 100644 --- a/docs/iris/example_tests/test_custom_aggregation.py +++ b/docs/iris/example_tests/test_custom_aggregation.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_custom_file_loading.py b/docs/iris/example_tests/test_custom_file_loading.py index ad9d94641a..ecfefc527a 100644 --- a/docs/iris/example_tests/test_custom_file_loading.py +++ b/docs/iris/example_tests/test_custom_file_loading.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_deriving_phenomena.py b/docs/iris/example_tests/test_deriving_phenomena.py index 2fa25e2dd3..a8280726b2 100644 --- a/docs/iris/example_tests/test_deriving_phenomena.py +++ b/docs/iris/example_tests/test_deriving_phenomena.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_global_map.py b/docs/iris/example_tests/test_global_map.py index d41fcaad06..e7e8187739 100644 --- a/docs/iris/example_tests/test_global_map.py +++ b/docs/iris/example_tests/test_global_map.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_hovmoller.py b/docs/iris/example_tests/test_hovmoller.py index 23fa2e528a..ccbf671035 100644 --- a/docs/iris/example_tests/test_hovmoller.py +++ b/docs/iris/example_tests/test_hovmoller.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_inset_plot.py b/docs/iris/example_tests/test_inset_plot.py index 95eda2ac85..7463886dbe 100644 --- a/docs/iris/example_tests/test_inset_plot.py +++ b/docs/iris/example_tests/test_inset_plot.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_lagged_ensemble.py b/docs/iris/example_tests/test_lagged_ensemble.py index d1cb13b596..e21087547b 100644 --- a/docs/iris/example_tests/test_lagged_ensemble.py +++ b/docs/iris/example_tests/test_lagged_ensemble.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_lineplot_with_legend.py b/docs/iris/example_tests/test_lineplot_with_legend.py index c95b702709..2e3ecaeaf1 100644 --- a/docs/iris/example_tests/test_lineplot_with_legend.py +++ b/docs/iris/example_tests/test_lineplot_with_legend.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_load_nemo.py b/docs/iris/example_tests/test_load_nemo.py index 489316464a..fc63a84443 100644 --- a/docs/iris/example_tests/test_load_nemo.py +++ b/docs/iris/example_tests/test_load_nemo.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_orca_projection.py b/docs/iris/example_tests/test_orca_projection.py index 75ca75ebd2..9a338892ff 100644 --- a/docs/iris/example_tests/test_orca_projection.py +++ b/docs/iris/example_tests/test_orca_projection.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_polar_stereo.py b/docs/iris/example_tests/test_polar_stereo.py index 328535fa76..ce2d91d10c 100644 --- a/docs/iris/example_tests/test_polar_stereo.py +++ b/docs/iris/example_tests/test_polar_stereo.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_polynomial_fit.py b/docs/iris/example_tests/test_polynomial_fit.py index 4a7c6c4339..a755b32cb8 100644 --- a/docs/iris/example_tests/test_polynomial_fit.py +++ b/docs/iris/example_tests/test_polynomial_fit.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_projections_and_annotations.py b/docs/iris/example_tests/test_projections_and_annotations.py index 40a1d4af1d..488b594806 100644 --- a/docs/iris/example_tests/test_projections_and_annotations.py +++ b/docs/iris/example_tests/test_projections_and_annotations.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_rotated_pole_mapping.py b/docs/iris/example_tests/test_rotated_pole_mapping.py index c6dd108285..f00fb2d39d 100644 --- a/docs/iris/example_tests/test_rotated_pole_mapping.py +++ b/docs/iris/example_tests/test_rotated_pole_mapping.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/example_tests/test_wind_speed.py b/docs/iris/example_tests/test_wind_speed.py index bc2fe2bc45..ec40276114 100644 --- a/docs/iris/example_tests/test_wind_speed.py +++ b/docs/iris/example_tests/test_wind_speed.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import Iris tests first so that some things can be initialised before diff --git a/docs/iris/src/conf.py b/docs/iris/src/conf.py index e5f978b9dc..3ce5ed5399 100644 --- a/docs/iris/src/conf.py +++ b/docs/iris/src/conf.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # -*- coding: utf-8 -*- diff --git a/docs/iris/src/developers_guide/gitwash_dumper.py b/docs/iris/src/developers_guide/gitwash_dumper.py index 999a738fa6..4379f55c5a 100644 --- a/docs/iris/src/developers_guide/gitwash_dumper.py +++ b/docs/iris/src/developers_guide/gitwash_dumper.py @@ -1,7 +1,6 @@ #!/usr/bin/env python ''' Checkout gitwash repo into directory and do search replace on name ''' -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import os diff --git a/docs/iris/src/sphinxext/auto_label_figures.py b/docs/iris/src/sphinxext/auto_label_figures.py index 837e68f079..c5981d1637 100644 --- a/docs/iris/src/sphinxext/auto_label_figures.py +++ b/docs/iris/src/sphinxext/auto_label_figures.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import os diff --git a/docs/iris/src/sphinxext/custom_class_autodoc.py b/docs/iris/src/sphinxext/custom_class_autodoc.py index a185954806..a517f22cc5 100644 --- a/docs/iris/src/sphinxext/custom_class_autodoc.py +++ b/docs/iris/src/sphinxext/custom_class_autodoc.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from sphinx.ext import autodoc diff --git a/docs/iris/src/sphinxext/custom_data_autodoc.py b/docs/iris/src/sphinxext/custom_data_autodoc.py index 3b41dde869..de063e13a7 100644 --- a/docs/iris/src/sphinxext/custom_data_autodoc.py +++ b/docs/iris/src/sphinxext/custom_data_autodoc.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from sphinx.ext.autodoc import DataDocumenter, ModuleLevelDocumenter diff --git a/docs/iris/src/sphinxext/gen_example_directory.py b/docs/iris/src/sphinxext/gen_example_directory.py index 7ba7e7aef8..fa20cc3092 100644 --- a/docs/iris/src/sphinxext/gen_example_directory.py +++ b/docs/iris/src/sphinxext/gen_example_directory.py @@ -9,7 +9,6 @@ Generate the rst files for the examples ''' -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import os diff --git a/docs/iris/src/sphinxext/gen_gallery.py b/docs/iris/src/sphinxext/gen_gallery.py index 1dabf919f7..6bf6ce5df1 100644 --- a/docs/iris/src/sphinxext/gen_gallery.py +++ b/docs/iris/src/sphinxext/gen_gallery.py @@ -6,7 +6,6 @@ Generate a thumbnail gallery of examples. ''' -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import os diff --git a/docs/iris/src/sphinxext/generate_package_rst.py b/docs/iris/src/sphinxext/generate_package_rst.py index 2d3853eacf..1b26e57829 100644 --- a/docs/iris/src/sphinxext/generate_package_rst.py +++ b/docs/iris/src/sphinxext/generate_package_rst.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import os diff --git a/docs/iris/src/userguide/plotting_examples/1d_quickplot_simple.py b/docs/iris/src/userguide/plotting_examples/1d_quickplot_simple.py index 75462101a0..8168d874c4 100644 --- a/docs/iris/src/userguide/plotting_examples/1d_quickplot_simple.py +++ b/docs/iris/src/userguide/plotting_examples/1d_quickplot_simple.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import matplotlib.pyplot as plt diff --git a/docs/iris/src/userguide/plotting_examples/1d_simple.py b/docs/iris/src/userguide/plotting_examples/1d_simple.py index 8cb3f45643..63fbc2897e 100644 --- a/docs/iris/src/userguide/plotting_examples/1d_simple.py +++ b/docs/iris/src/userguide/plotting_examples/1d_simple.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import matplotlib.pyplot as plt diff --git a/docs/iris/src/userguide/plotting_examples/1d_with_legend.py b/docs/iris/src/userguide/plotting_examples/1d_with_legend.py index b0aee43c4a..c28e8e23c8 100644 --- a/docs/iris/src/userguide/plotting_examples/1d_with_legend.py +++ b/docs/iris/src/userguide/plotting_examples/1d_with_legend.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import matplotlib.pyplot as plt diff --git a/docs/iris/src/userguide/plotting_examples/brewer.py b/docs/iris/src/userguide/plotting_examples/brewer.py index 2d61e276ab..84acf63ab7 100644 --- a/docs/iris/src/userguide/plotting_examples/brewer.py +++ b/docs/iris/src/userguide/plotting_examples/brewer.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import matplotlib.pyplot as plt diff --git a/docs/iris/src/userguide/plotting_examples/cube_blockplot.py b/docs/iris/src/userguide/plotting_examples/cube_blockplot.py index a6273a274c..8e71ad8911 100644 --- a/docs/iris/src/userguide/plotting_examples/cube_blockplot.py +++ b/docs/iris/src/userguide/plotting_examples/cube_blockplot.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import matplotlib.pyplot as plt diff --git a/docs/iris/src/userguide/plotting_examples/cube_brewer_cite_contourf.py b/docs/iris/src/userguide/plotting_examples/cube_brewer_cite_contourf.py index 9ba68fc47a..2e929f8d8d 100644 --- a/docs/iris/src/userguide/plotting_examples/cube_brewer_cite_contourf.py +++ b/docs/iris/src/userguide/plotting_examples/cube_brewer_cite_contourf.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import matplotlib.pyplot as plt diff --git a/docs/iris/src/userguide/plotting_examples/cube_brewer_contourf.py b/docs/iris/src/userguide/plotting_examples/cube_brewer_contourf.py index aacf129c30..30d4690067 100644 --- a/docs/iris/src/userguide/plotting_examples/cube_brewer_contourf.py +++ b/docs/iris/src/userguide/plotting_examples/cube_brewer_contourf.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import matplotlib.cm as mpl_cm diff --git a/docs/iris/src/userguide/plotting_examples/cube_contour.py b/docs/iris/src/userguide/plotting_examples/cube_contour.py index 0ec2fa7be4..b1f35696a7 100644 --- a/docs/iris/src/userguide/plotting_examples/cube_contour.py +++ b/docs/iris/src/userguide/plotting_examples/cube_contour.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import matplotlib.pyplot as plt diff --git a/docs/iris/src/userguide/plotting_examples/cube_contourf.py b/docs/iris/src/userguide/plotting_examples/cube_contourf.py index 21ebb1a214..2deef44faf 100644 --- a/docs/iris/src/userguide/plotting_examples/cube_contourf.py +++ b/docs/iris/src/userguide/plotting_examples/cube_contourf.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import matplotlib.pyplot as plt diff --git a/docs/iris/src/userguide/regridding_plots/interpolate_column.py b/docs/iris/src/userguide/regridding_plots/interpolate_column.py index 201dcda4a1..e7447c1de0 100644 --- a/docs/iris/src/userguide/regridding_plots/interpolate_column.py +++ b/docs/iris/src/userguide/regridding_plots/interpolate_column.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import iris diff --git a/docs/iris/src/userguide/regridding_plots/regridded_to_global.py b/docs/iris/src/userguide/regridding_plots/regridded_to_global.py index c392de7a52..fd39eb69b8 100644 --- a/docs/iris/src/userguide/regridding_plots/regridded_to_global.py +++ b/docs/iris/src/userguide/regridding_plots/regridded_to_global.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import iris diff --git a/docs/iris/src/userguide/regridding_plots/regridded_to_global_area_weighted.py b/docs/iris/src/userguide/regridding_plots/regridded_to_global_area_weighted.py index 067a4ee2d6..b43246b758 100644 --- a/docs/iris/src/userguide/regridding_plots/regridded_to_global_area_weighted.py +++ b/docs/iris/src/userguide/regridding_plots/regridded_to_global_area_weighted.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import iris diff --git a/docs/iris/src/userguide/regridding_plots/regridded_to_rotated.py b/docs/iris/src/userguide/regridding_plots/regridded_to_rotated.py index f2c2b271df..276eea488d 100644 --- a/docs/iris/src/userguide/regridding_plots/regridded_to_rotated.py +++ b/docs/iris/src/userguide/regridding_plots/regridded_to_rotated.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import iris diff --git a/docs/iris/src/userguide/regridding_plots/regridding_plot.py b/docs/iris/src/userguide/regridding_plots/regridding_plot.py index 2419d47727..387ea44876 100644 --- a/docs/iris/src/userguide/regridding_plots/regridding_plot.py +++ b/docs/iris/src/userguide/regridding_plots/regridding_plot.py @@ -1,5 +1,4 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import iris diff --git a/docs/iris/src/whatsnew/aggregate_directory.py b/docs/iris/src/whatsnew/aggregate_directory.py index 1bc4917027..401d841bcf 100644 --- a/docs/iris/src/whatsnew/aggregate_directory.py +++ b/docs/iris/src/whatsnew/aggregate_directory.py @@ -19,7 +19,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import datetime from glob import glob diff --git a/lib/iris/__init__.py b/lib/iris/__init__.py index a0f9f86db8..84bdbbd1b1 100644 --- a/lib/iris/__init__.py +++ b/lib/iris/__init__.py @@ -85,7 +85,6 @@ def callback(cube, field, filename): """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/_concatenate.py b/lib/iris/_concatenate.py index 97471d4f3b..5fd3e26378 100644 --- a/lib/iris/_concatenate.py +++ b/lib/iris/_concatenate.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/_constraints.py b/lib/iris/_constraints.py index d08e952968..b7f0df4305 100644 --- a/lib/iris/_constraints.py +++ b/lib/iris/_constraints.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/_cube_coord_common.py b/lib/iris/_cube_coord_common.py index bfc68580a0..462a5678a9 100644 --- a/lib/iris/_cube_coord_common.py +++ b/lib/iris/_cube_coord_common.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/_data_manager.py b/lib/iris/_data_manager.py index 1219cebf15..c7cb46bacc 100644 --- a/lib/iris/_data_manager.py +++ b/lib/iris/_data_manager.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/_deprecation.py b/lib/iris/_deprecation.py index 6a4341dc5a..e5e4e768bb 100644 --- a/lib/iris/_deprecation.py +++ b/lib/iris/_deprecation.py @@ -7,7 +7,6 @@ Utilities for producing runtime deprecation messages. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/_lazy_data.py b/lib/iris/_lazy_data.py index 95728c662c..ab8732ea2a 100644 --- a/lib/iris/_lazy_data.py +++ b/lib/iris/_lazy_data.py @@ -9,7 +9,6 @@ To avoid replicating implementation-dependent test and conversion code. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from functools import wraps diff --git a/lib/iris/_merge.py b/lib/iris/_merge.py index 4a99510820..f81a6be0e7 100644 --- a/lib/iris/_merge.py +++ b/lib/iris/_merge.py @@ -11,7 +11,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/analysis/__init__.py b/lib/iris/analysis/__init__.py index 2244db8231..279a673f5d 100644 --- a/lib/iris/analysis/__init__.py +++ b/lib/iris/analysis/__init__.py @@ -35,7 +35,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/analysis/_area_weighted.py b/lib/iris/analysis/_area_weighted.py index c343e92cf0..267862595d 100644 --- a/lib/iris/analysis/_area_weighted.py +++ b/lib/iris/analysis/_area_weighted.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import numpy as np diff --git a/lib/iris/analysis/_grid_angles.py b/lib/iris/analysis/_grid_angles.py index fd4a0963ae..8c4dbdcd5a 100644 --- a/lib/iris/analysis/_grid_angles.py +++ b/lib/iris/analysis/_grid_angles.py @@ -8,7 +8,6 @@ from coordinate points and bounds. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import numpy as np diff --git a/lib/iris/analysis/_interpolation.py b/lib/iris/analysis/_interpolation.py index a3946fe088..e778e2911f 100644 --- a/lib/iris/analysis/_interpolation.py +++ b/lib/iris/analysis/_interpolation.py @@ -5,7 +5,6 @@ # licensing details. """A collection of helpers for interpolation.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from collections import namedtuple diff --git a/lib/iris/analysis/_regrid.py b/lib/iris/analysis/_regrid.py index 4101ad6c82..4fefae5527 100644 --- a/lib/iris/analysis/_regrid.py +++ b/lib/iris/analysis/_regrid.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/analysis/_scipy_interpolate.py b/lib/iris/analysis/_scipy_interpolate.py index 996a2ad50e..2f288a8dec 100644 --- a/lib/iris/analysis/_scipy_interpolate.py +++ b/lib/iris/analysis/_scipy_interpolate.py @@ -1,4 +1,3 @@ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import itertools diff --git a/lib/iris/analysis/calculus.py b/lib/iris/analysis/calculus.py index ba83b4e6ea..8178ff1ac7 100644 --- a/lib/iris/analysis/calculus.py +++ b/lib/iris/analysis/calculus.py @@ -10,7 +10,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/analysis/cartography.py b/lib/iris/analysis/cartography.py index 79c3be0d5f..f9233750a1 100644 --- a/lib/iris/analysis/cartography.py +++ b/lib/iris/analysis/cartography.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from collections import namedtuple diff --git a/lib/iris/analysis/geometry.py b/lib/iris/analysis/geometry.py index b305f9eb93..7537ce04aa 100644 --- a/lib/iris/analysis/geometry.py +++ b/lib/iris/analysis/geometry.py @@ -11,7 +11,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import warnings diff --git a/lib/iris/analysis/maths.py b/lib/iris/analysis/maths.py index bd6f87bcf2..1f55f2c90f 100644 --- a/lib/iris/analysis/maths.py +++ b/lib/iris/analysis/maths.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import inspect diff --git a/lib/iris/analysis/stats.py b/lib/iris/analysis/stats.py index be5518aa17..5667d308d0 100644 --- a/lib/iris/analysis/stats.py +++ b/lib/iris/analysis/stats.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import numpy as np diff --git a/lib/iris/analysis/trajectory.py b/lib/iris/analysis/trajectory.py index 12269f9654..5505da5d08 100644 --- a/lib/iris/analysis/trajectory.py +++ b/lib/iris/analysis/trajectory.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/aux_factory.py b/lib/iris/aux_factory.py index c78c8a918d..d834736da3 100644 --- a/lib/iris/aux_factory.py +++ b/lib/iris/aux_factory.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/config.py b/lib/iris/config.py index 5abfa599c6..763c84a3bb 100644 --- a/lib/iris/config.py +++ b/lib/iris/config.py @@ -30,7 +30,6 @@ ---------- """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six from six.moves import configparser diff --git a/lib/iris/coord_categorisation.py b/lib/iris/coord_categorisation.py index eb6f930ad6..36f4600103 100644 --- a/lib/iris/coord_categorisation.py +++ b/lib/iris/coord_categorisation.py @@ -16,7 +16,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/coord_systems.py b/lib/iris/coord_systems.py index 32a0896ffd..c7bd8703cb 100644 --- a/lib/iris/coord_systems.py +++ b/lib/iris/coord_systems.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/coords.py b/lib/iris/coords.py index 2aa7f542f9..2044d54af9 100644 --- a/lib/iris/coords.py +++ b/lib/iris/coords.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/cube.py b/lib/iris/cube.py index e5257b7060..1784eec62a 100644 --- a/lib/iris/cube.py +++ b/lib/iris/cube.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/exceptions.py b/lib/iris/exceptions.py index b83f939537..34aedcc10b 100644 --- a/lib/iris/exceptions.py +++ b/lib/iris/exceptions.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/experimental/__init__.py b/lib/iris/experimental/__init__.py index 588a381783..d657ac4a55 100644 --- a/lib/iris/experimental/__init__.py +++ b/lib/iris/experimental/__init__.py @@ -11,5 +11,4 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/experimental/animate.py b/lib/iris/experimental/animate.py index a0e2c25973..63e3b7d716 100644 --- a/lib/iris/experimental/animate.py +++ b/lib/iris/experimental/animate.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import warnings diff --git a/lib/iris/experimental/concatenate.py b/lib/iris/experimental/concatenate.py index a5c1cdfb68..d7bfcfa2c8 100644 --- a/lib/iris/experimental/concatenate.py +++ b/lib/iris/experimental/concatenate.py @@ -13,7 +13,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/experimental/equalise_cubes.py b/lib/iris/experimental/equalise_cubes.py index 17203ce708..bdd566cd19 100644 --- a/lib/iris/experimental/equalise_cubes.py +++ b/lib/iris/experimental/equalise_cubes.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import numpy as np diff --git a/lib/iris/experimental/raster.py b/lib/iris/experimental/raster.py index 3479a7721f..94f97f028c 100644 --- a/lib/iris/experimental/raster.py +++ b/lib/iris/experimental/raster.py @@ -14,7 +14,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import numpy as np diff --git a/lib/iris/experimental/regrid.py b/lib/iris/experimental/regrid.py index b7436bfc4b..95074e531e 100644 --- a/lib/iris/experimental/regrid.py +++ b/lib/iris/experimental/regrid.py @@ -7,7 +7,6 @@ Regridding functions. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/experimental/regrid_conservative.py b/lib/iris/experimental/regrid_conservative.py index 115bb79f5f..e7520404c8 100644 --- a/lib/iris/experimental/regrid_conservative.py +++ b/lib/iris/experimental/regrid_conservative.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import cartopy.crs as ccrs diff --git a/lib/iris/experimental/representation.py b/lib/iris/experimental/representation.py index f523003963..5069e2103d 100644 --- a/lib/iris/experimental/representation.py +++ b/lib/iris/experimental/representation.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from html import escape diff --git a/lib/iris/experimental/stratify.py b/lib/iris/experimental/stratify.py index b4e7ced5af..f03d6fabfc 100644 --- a/lib/iris/experimental/stratify.py +++ b/lib/iris/experimental/stratify.py @@ -8,7 +8,6 @@ Z direction. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from functools import partial diff --git a/lib/iris/experimental/ugrid.py b/lib/iris/experimental/ugrid.py index f045280341..b88fd198b9 100644 --- a/lib/iris/experimental/ugrid.py +++ b/lib/iris/experimental/ugrid.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import iris diff --git a/lib/iris/fileformats/__init__.py b/lib/iris/fileformats/__init__.py index 527673bd67..fd4b2bc9ad 100644 --- a/lib/iris/fileformats/__init__.py +++ b/lib/iris/fileformats/__init__.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from iris.io.format_picker import (FileExtension, FormatAgent, diff --git a/lib/iris/fileformats/_ff.py b/lib/iris/fileformats/_ff.py index d56582ab15..59fa80c607 100644 --- a/lib/iris/fileformats/_ff.py +++ b/lib/iris/fileformats/_ff.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import os diff --git a/lib/iris/fileformats/_ff_cross_references.py b/lib/iris/fileformats/_ff_cross_references.py index 7e943eeadb..3967ea6070 100644 --- a/lib/iris/fileformats/_ff_cross_references.py +++ b/lib/iris/fileformats/_ff_cross_references.py @@ -11,7 +11,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from collections import namedtuple diff --git a/lib/iris/fileformats/_pp_lbproc_pairs.py b/lib/iris/fileformats/_pp_lbproc_pairs.py index 76f62f6a9c..380956b118 100644 --- a/lib/iris/fileformats/_pp_lbproc_pairs.py +++ b/lib/iris/fileformats/_pp_lbproc_pairs.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/_structured_array_identification.py b/lib/iris/fileformats/_structured_array_identification.py index f83d9423cb..b3c43d5219 100644 --- a/lib/iris/fileformats/_structured_array_identification.py +++ b/lib/iris/fileformats/_structured_array_identification.py @@ -43,7 +43,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from collections import namedtuple diff --git a/lib/iris/fileformats/abf.py b/lib/iris/fileformats/abf.py index 2817020c6d..e5e8f8f263 100644 --- a/lib/iris/fileformats/abf.py +++ b/lib/iris/fileformats/abf.py @@ -14,7 +14,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/cf.py b/lib/iris/fileformats/cf.py index 1917f8a3e1..80883a9b85 100644 --- a/lib/iris/fileformats/cf.py +++ b/lib/iris/fileformats/cf.py @@ -14,7 +14,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/dot.py b/lib/iris/fileformats/dot.py index 950feeb3b0..35ca2fc3ac 100644 --- a/lib/iris/fileformats/dot.py +++ b/lib/iris/fileformats/dot.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/name.py b/lib/iris/fileformats/name.py index 22ef471892..919362c9ab 100644 --- a/lib/iris/fileformats/name.py +++ b/lib/iris/fileformats/name.py @@ -5,7 +5,6 @@ # licensing details. """Provides NAME file format loading capabilities.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/name_loaders.py b/lib/iris/fileformats/name_loaders.py index 46c66603a2..dbf8f18da8 100644 --- a/lib/iris/fileformats/name_loaders.py +++ b/lib/iris/fileformats/name_loaders.py @@ -5,7 +5,6 @@ # licensing details. """NAME file format loading functions.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/netcdf.py b/lib/iris/fileformats/netcdf.py index 731420e3e4..7de3f340cf 100644 --- a/lib/iris/fileformats/netcdf.py +++ b/lib/iris/fileformats/netcdf.py @@ -13,7 +13,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from six.moves import zip_longest # Previous line may not be tampered with! import six diff --git a/lib/iris/fileformats/nimrod.py b/lib/iris/fileformats/nimrod.py index 1e4a3b5adf..57c67a5eea 100644 --- a/lib/iris/fileformats/nimrod.py +++ b/lib/iris/fileformats/nimrod.py @@ -5,7 +5,6 @@ # licensing details. """Provides NIMROD file format capabilities.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/nimrod_load_rules.py b/lib/iris/fileformats/nimrod_load_rules.py index 4d611c1aa4..e216f66760 100644 --- a/lib/iris/fileformats/nimrod_load_rules.py +++ b/lib/iris/fileformats/nimrod_load_rules.py @@ -5,7 +5,6 @@ # licensing details. """Rules for converting NIMROD fields into cubes.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/fileformats/pp.py b/lib/iris/fileformats/pp.py index 0b124966b6..b15b87aa13 100644 --- a/lib/iris/fileformats/pp.py +++ b/lib/iris/fileformats/pp.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/pp_load_rules.py b/lib/iris/fileformats/pp_load_rules.py index be722b98f9..0ab9dd7703 100644 --- a/lib/iris/fileformats/pp_load_rules.py +++ b/lib/iris/fileformats/pp_load_rules.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/pp_save_rules.py b/lib/iris/fileformats/pp_save_rules.py index 93e26051b8..b0203585bf 100644 --- a/lib/iris/fileformats/pp_save_rules.py +++ b/lib/iris/fileformats/pp_save_rules.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/rules.py b/lib/iris/fileformats/rules.py index ace5b2f902..c242da7d78 100644 --- a/lib/iris/fileformats/rules.py +++ b/lib/iris/fileformats/rules.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/um/__init__.py b/lib/iris/fileformats/um/__init__.py index 5cf5db7644..7b01fbce4b 100644 --- a/lib/iris/fileformats/um/__init__.py +++ b/lib/iris/fileformats/um/__init__.py @@ -11,7 +11,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Publish the FF-replacement features here, and include documentation. diff --git a/lib/iris/fileformats/um/_fast_load.py b/lib/iris/fileformats/um/_fast_load.py index c1457340ce..384f57e4ea 100644 --- a/lib/iris/fileformats/um/_fast_load.py +++ b/lib/iris/fileformats/um/_fast_load.py @@ -21,7 +21,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/um/_fast_load_structured_fields.py b/lib/iris/fileformats/um/_fast_load_structured_fields.py index d9084e4de4..7f060b4a23 100644 --- a/lib/iris/fileformats/um/_fast_load_structured_fields.py +++ b/lib/iris/fileformats/um/_fast_load_structured_fields.py @@ -12,7 +12,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import itertools diff --git a/lib/iris/fileformats/um/_ff_replacement.py b/lib/iris/fileformats/um/_ff_replacement.py index ae639696ee..1b5816b3ef 100644 --- a/lib/iris/fileformats/um/_ff_replacement.py +++ b/lib/iris/fileformats/um/_ff_replacement.py @@ -11,7 +11,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/um/_optimal_array_structuring.py b/lib/iris/fileformats/um/_optimal_array_structuring.py index 59450fae06..3c77d89ca1 100644 --- a/lib/iris/fileformats/um/_optimal_array_structuring.py +++ b/lib/iris/fileformats/um/_optimal_array_structuring.py @@ -5,7 +5,6 @@ # licensing details. """A module to provide an optimal array structure calculation.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/fileformats/um_cf_map.py b/lib/iris/fileformats/um_cf_map.py index a99f5c4e91..006fdd6c17 100644 --- a/lib/iris/fileformats/um_cf_map.py +++ b/lib/iris/fileformats/um_cf_map.py @@ -16,7 +16,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from collections import namedtuple diff --git a/lib/iris/io/__init__.py b/lib/iris/io/__init__.py index e7064f65aa..e64146b4b2 100644 --- a/lib/iris/io/__init__.py +++ b/lib/iris/io/__init__.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/io/format_picker.py b/lib/iris/io/format_picker.py index e2ab57e930..fc0f458acc 100644 --- a/lib/iris/io/format_picker.py +++ b/lib/iris/io/format_picker.py @@ -40,7 +40,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/iterate.py b/lib/iris/iterate.py index 9dcd086614..0c14b127ce 100644 --- a/lib/iris/iterate.py +++ b/lib/iris/iterate.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa try: # Python 3 diff --git a/lib/iris/palette.py b/lib/iris/palette.py index d383a7f695..8c8cef1d6d 100644 --- a/lib/iris/palette.py +++ b/lib/iris/palette.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/pandas.py b/lib/iris/pandas.py index 6f999d8556..4d3fd618be 100644 --- a/lib/iris/pandas.py +++ b/lib/iris/pandas.py @@ -10,7 +10,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import datetime diff --git a/lib/iris/plot.py b/lib/iris/plot.py index 9f16b4fd16..23ed224c95 100644 --- a/lib/iris/plot.py +++ b/lib/iris/plot.py @@ -11,7 +11,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import collections diff --git a/lib/iris/quickplot.py b/lib/iris/quickplot.py index a9f09ad356..a0cc4496dc 100644 --- a/lib/iris/quickplot.py +++ b/lib/iris/quickplot.py @@ -13,7 +13,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import cf_units diff --git a/lib/iris/symbols.py b/lib/iris/symbols.py index 73db9ecb44..85c6367e84 100644 --- a/lib/iris/symbols.py +++ b/lib/iris/symbols.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/__init__.py b/lib/iris/tests/__init__.py index 709a78f5f8..eb84673912 100644 --- a/lib/iris/tests/__init__.py +++ b/lib/iris/tests/__init__.py @@ -19,7 +19,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/experimental/__init__.py b/lib/iris/tests/experimental/__init__.py index d36c58c8e7..ef53e57ca4 100644 --- a/lib/iris/tests/experimental/__init__.py +++ b/lib/iris/tests/experimental/__init__.py @@ -8,5 +8,4 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/experimental/regrid/__init__.py b/lib/iris/tests/experimental/regrid/__init__.py index 580cb37939..f23a9e2fdc 100644 --- a/lib/iris/tests/experimental/regrid/__init__.py +++ b/lib/iris/tests/experimental/regrid/__init__.py @@ -8,5 +8,4 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py b/lib/iris/tests/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py index e885219e12..c4a957e7c8 100644 --- a/lib/iris/tests/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py +++ b/lib/iris/tests/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/experimental/regrid/test_regrid_conservative_via_esmpy.py b/lib/iris/tests/experimental/regrid/test_regrid_conservative_via_esmpy.py index f825874953..bebd36c9e6 100644 --- a/lib/iris/tests/experimental/regrid/test_regrid_conservative_via_esmpy.py +++ b/lib/iris/tests/experimental/regrid/test_regrid_conservative_via_esmpy.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/experimental/test_animate.py b/lib/iris/tests/experimental/test_animate.py index 1c4d4350a9..ed36bc3f9e 100644 --- a/lib/iris/tests/experimental/test_animate.py +++ b/lib/iris/tests/experimental/test_animate.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/experimental/test_raster.py b/lib/iris/tests/experimental/test_raster.py index a845c44099..f9ccbbe63f 100644 --- a/lib/iris/tests/experimental/test_raster.py +++ b/lib/iris/tests/experimental/test_raster.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/experimental/ugrid/__init__.py b/lib/iris/tests/experimental/ugrid/__init__.py index 45574585b5..a192e5fade 100644 --- a/lib/iris/tests/experimental/ugrid/__init__.py +++ b/lib/iris/tests/experimental/ugrid/__init__.py @@ -8,5 +8,4 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/experimental/ugrid/test_ugrid.py b/lib/iris/tests/experimental/ugrid/test_ugrid.py index e24c4186eb..ff31d82dcd 100644 --- a/lib/iris/tests/experimental/ugrid/test_ugrid.py +++ b/lib/iris/tests/experimental/ugrid/test_ugrid.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import iris.tests as tests diff --git a/lib/iris/tests/idiff.py b/lib/iris/tests/idiff.py index 5248c5dfc7..f9ce0ece56 100755 --- a/lib/iris/tests/idiff.py +++ b/lib/iris/tests/idiff.py @@ -11,7 +11,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import argparse diff --git a/lib/iris/tests/integration/__init__.py b/lib/iris/tests/integration/__init__.py index 9b72203b94..7ca4ce9ec6 100644 --- a/lib/iris/tests/integration/__init__.py +++ b/lib/iris/tests/integration/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Integration tests for the :mod:`iris` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/integration/aux_factory/__init__.py b/lib/iris/tests/integration/aux_factory/__init__.py index 00c365c9ff..7e50f43013 100644 --- a/lib/iris/tests/integration/aux_factory/__init__.py +++ b/lib/iris/tests/integration/aux_factory/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Integration tests for the :mod:`iris.aux_factory` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/integration/aux_factory/test_OceanSigmaZFactory.py b/lib/iris/tests/integration/aux_factory/test_OceanSigmaZFactory.py index c2a5c88056..7e6edc690c 100644 --- a/lib/iris/tests/integration/aux_factory/test_OceanSigmaZFactory.py +++ b/lib/iris/tests/integration/aux_factory/test_OceanSigmaZFactory.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/concatenate/__init__.py b/lib/iris/tests/integration/concatenate/__init__.py index e18b964099..4b6692c254 100644 --- a/lib/iris/tests/integration/concatenate/__init__.py +++ b/lib/iris/tests/integration/concatenate/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Integration tests for the :mod:`iris._concatenate` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/integration/concatenate/test_concatenate.py b/lib/iris/tests/integration/concatenate/test_concatenate.py index 789476b253..9db9aed628 100644 --- a/lib/iris/tests/integration/concatenate/test_concatenate.py +++ b/lib/iris/tests/integration/concatenate/test_concatenate.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/integration/experimental/__init__.py b/lib/iris/tests/integration/experimental/__init__.py index 13f45e33f7..61e926f453 100644 --- a/lib/iris/tests/integration/experimental/__init__.py +++ b/lib/iris/tests/integration/experimental/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Integration tests for the :mod:`iris.experimental` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/integration/experimental/test_CubeRepresentation.py b/lib/iris/tests/integration/experimental/test_CubeRepresentation.py index 967173ff5f..d973201ceb 100644 --- a/lib/iris/tests/integration/experimental/test_CubeRepresentation.py +++ b/lib/iris/tests/integration/experimental/test_CubeRepresentation.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for cube html representation.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from html import escape diff --git a/lib/iris/tests/integration/experimental/test_regrid_ProjectedUnstructured.py b/lib/iris/tests/integration/experimental/test_regrid_ProjectedUnstructured.py index d5abad0db0..d74ee5ab2e 100644 --- a/lib/iris/tests/integration/experimental/test_regrid_ProjectedUnstructured.py +++ b/lib/iris/tests/integration/experimental/test_regrid_ProjectedUnstructured.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for experimental regridding.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/fast_load/__init__.py b/lib/iris/tests/integration/fast_load/__init__.py index 2f5f7563f4..bd637837ae 100644 --- a/lib/iris/tests/integration/fast_load/__init__.py +++ b/lib/iris/tests/integration/fast_load/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Integration tests for :mod:`iris.fileformats.um` fast load functions.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/integration/fast_load/test_fast_load.py b/lib/iris/tests/integration/fast_load/test_fast_load.py index 7188e52e22..1d73ab7a7d 100644 --- a/lib/iris/tests/integration/fast_load/test_fast_load.py +++ b/lib/iris/tests/integration/fast_load/test_fast_load.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for fast-loading FF and PP files.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/integration/format_interop/__init__.py b/lib/iris/tests/integration/format_interop/__init__.py index 14ef6a98f1..9b3017faa7 100644 --- a/lib/iris/tests/integration/format_interop/__init__.py +++ b/lib/iris/tests/integration/format_interop/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Integration tests for format interoperability.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/integration/format_interop/test_name_grib.py b/lib/iris/tests/integration/format_interop/test_name_grib.py index b027812279..743cac5062 100644 --- a/lib/iris/tests/integration/format_interop/test_name_grib.py +++ b/lib/iris/tests/integration/format_interop/test_name_grib.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for NAME to GRIB2 interoperability.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/format_interop/test_pp_grib.py b/lib/iris/tests/integration/format_interop/test_pp_grib.py index 1339f81968..782f067eb7 100644 --- a/lib/iris/tests/integration/format_interop/test_pp_grib.py +++ b/lib/iris/tests/integration/format_interop/test_pp_grib.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for PP/GRIB interoperability.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/plot/__init__.py b/lib/iris/tests/integration/plot/__init__.py index 185181fe92..67f7dde82e 100644 --- a/lib/iris/tests/integration/plot/__init__.py +++ b/lib/iris/tests/integration/plot/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Integration tests for the :mod:`iris.plot` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/integration/plot/test_colorbar.py b/lib/iris/tests/integration/plot/test_colorbar.py index 1088238c6a..f6342411e2 100644 --- a/lib/iris/tests/integration/plot/test_colorbar.py +++ b/lib/iris/tests/integration/plot/test_colorbar.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/plot/test_netcdftime.py b/lib/iris/tests/integration/plot/test_netcdftime.py index afe8c4c653..52e59ae282 100644 --- a/lib/iris/tests/integration/plot/test_netcdftime.py +++ b/lib/iris/tests/integration/plot/test_netcdftime.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/plot/test_nzdateline.py b/lib/iris/tests/integration/plot/test_nzdateline.py index 026103f76c..73064e16c7 100644 --- a/lib/iris/tests/integration/plot/test_nzdateline.py +++ b/lib/iris/tests/integration/plot/test_nzdateline.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/plot/test_plot_2d_coords.py b/lib/iris/tests/integration/plot/test_plot_2d_coords.py index d7100761ee..f1acb0600f 100644 --- a/lib/iris/tests/integration/plot/test_plot_2d_coords.py +++ b/lib/iris/tests/integration/plot/test_plot_2d_coords.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/plot/test_vector_plots.py b/lib/iris/tests/integration/plot/test_vector_plots.py index f7a567c195..a2376b7e0c 100644 --- a/lib/iris/tests/integration/plot/test_vector_plots.py +++ b/lib/iris/tests/integration/plot/test_vector_plots.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_PartialDateTime.py b/lib/iris/tests/integration/test_PartialDateTime.py index aeece82ecf..1887316854 100644 --- a/lib/iris/tests/integration/test_PartialDateTime.py +++ b/lib/iris/tests/integration/test_PartialDateTime.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for :class:`iris.time.PartialDateTime`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_climatology.py b/lib/iris/tests/integration/test_climatology.py index f4d639af90..fa55bf89ba 100644 --- a/lib/iris/tests/integration/test_climatology.py +++ b/lib/iris/tests/integration/test_climatology.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for loading and saving netcdf files.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_cube.py b/lib/iris/tests/integration/test_cube.py index 049d417eb8..2bea650484 100644 --- a/lib/iris/tests/integration/test_cube.py +++ b/lib/iris/tests/integration/test_cube.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for :class:`iris.cube.Cube`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_ff.py b/lib/iris/tests/integration/test_ff.py index 15ff33fd4c..8afb33fa55 100644 --- a/lib/iris/tests/integration/test_ff.py +++ b/lib/iris/tests/integration/test_ff.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for loading LBC fieldsfiles.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_grib2.py b/lib/iris/tests/integration/test_grib2.py index 0f811611cb..13fbcedfd3 100644 --- a/lib/iris/tests/integration/test_grib2.py +++ b/lib/iris/tests/integration/test_grib2.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for loading and saving GRIB2 files.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_grib_load.py b/lib/iris/tests/integration/test_grib_load.py index ba74f39bb3..045adbf23a 100644 --- a/lib/iris/tests/integration/test_grib_load.py +++ b/lib/iris/tests/integration/test_grib_load.py @@ -14,7 +14,6 @@ specific, and target the module 'iris_grib'. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_netcdf.py b/lib/iris/tests/integration/test_netcdf.py index 4bdaa1dcab..53b8aa71d9 100644 --- a/lib/iris/tests/integration/test_netcdf.py +++ b/lib/iris/tests/integration/test_netcdf.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for loading and saving netcdf files.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/integration/test_new_axis.py b/lib/iris/tests/integration/test_new_axis.py index 8941f031fa..6ed1e865a9 100644 --- a/lib/iris/tests/integration/test_new_axis.py +++ b/lib/iris/tests/integration/test_new_axis.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for :func:`iris.util.new_axis`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_pickle.py b/lib/iris/tests/integration/test_pickle.py index 8aaca62f03..5af72ef28d 100644 --- a/lib/iris/tests/integration/test_pickle.py +++ b/lib/iris/tests/integration/test_pickle.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for pickling things.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_pp.py b/lib/iris/tests/integration/test_pp.py index 7978b298e9..da5b5804a1 100644 --- a/lib/iris/tests/integration/test_pp.py +++ b/lib/iris/tests/integration/test_pp.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for loading and saving PP files.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_pp_constrained_load_cubes.py b/lib/iris/tests/integration/test_pp_constrained_load_cubes.py index 4de32a79c3..0ed0be1843 100644 --- a/lib/iris/tests/integration/test_pp_constrained_load_cubes.py +++ b/lib/iris/tests/integration/test_pp_constrained_load_cubes.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for :func:`iris.fileformats.rules.load_cubes`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_regrid_equivalence.py b/lib/iris/tests/integration/test_regrid_equivalence.py index f910f61c38..2c878d63d7 100644 --- a/lib/iris/tests/integration/test_regrid_equivalence.py +++ b/lib/iris/tests/integration/test_regrid_equivalence.py @@ -9,7 +9,6 @@ "iris.cube.Cube.regrid(scheme=iris.analysis.Nearest())". """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_regridding.py b/lib/iris/tests/integration/test_regridding.py index 40d83c70fb..0ada16c41a 100644 --- a/lib/iris/tests/integration/test_regridding.py +++ b/lib/iris/tests/integration/test_regridding.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for regridding.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_subset.py b/lib/iris/tests/integration/test_subset.py index 78aa1ac578..d2f66a61b2 100644 --- a/lib/iris/tests/integration/test_subset.py +++ b/lib/iris/tests/integration/test_subset.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for subset.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/integration/test_trajectory.py b/lib/iris/tests/integration/test_trajectory.py index 0ab9e22289..d39ac74854 100644 --- a/lib/iris/tests/integration/test_trajectory.py +++ b/lib/iris/tests/integration/test_trajectory.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for :mod:`iris.analysis.trajectory`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/integration/um/__init__.py b/lib/iris/tests/integration/um/__init__.py index 2f5f7563f4..bd637837ae 100644 --- a/lib/iris/tests/integration/um/__init__.py +++ b/lib/iris/tests/integration/um/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Integration tests for :mod:`iris.fileformats.um` fast load functions.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/integration/um/test_fieldsfile.py b/lib/iris/tests/integration/um/test_fieldsfile.py index 20e0b962a8..bdbb076072 100644 --- a/lib/iris/tests/integration/um/test_fieldsfile.py +++ b/lib/iris/tests/integration/um/test_fieldsfile.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/pp.py b/lib/iris/tests/pp.py index d5c61a5f1c..94a59bdd3e 100644 --- a/lib/iris/tests/pp.py +++ b/lib/iris/tests/pp.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import contextlib diff --git a/lib/iris/tests/runner/__init__.py b/lib/iris/tests/runner/__init__.py index f5820e8a1d..1894584a92 100644 --- a/lib/iris/tests/runner/__init__.py +++ b/lib/iris/tests/runner/__init__.py @@ -8,5 +8,4 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/runner/__main__.py b/lib/iris/tests/runner/__main__.py index bdb5c66210..08a2a82f46 100644 --- a/lib/iris/tests/runner/__main__.py +++ b/lib/iris/tests/runner/__main__.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import argparse diff --git a/lib/iris/tests/runner/_runner.py b/lib/iris/tests/runner/_runner.py index 257512ecf7..47b672fc3a 100644 --- a/lib/iris/tests/runner/_runner.py +++ b/lib/iris/tests/runner/_runner.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Because this file is imported by setup.py, there may be additional runtime diff --git a/lib/iris/tests/stock/__init__.py b/lib/iris/tests/stock/__init__.py index bee2c906dc..3a245b6d49 100644 --- a/lib/iris/tests/stock/__init__.py +++ b/lib/iris/tests/stock/__init__.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/stock/_stock_2d_latlons.py b/lib/iris/tests/stock/_stock_2d_latlons.py index f746240a62..a2d676fbc9 100644 --- a/lib/iris/tests/stock/_stock_2d_latlons.py +++ b/lib/iris/tests/stock/_stock_2d_latlons.py @@ -8,7 +8,6 @@ to mimic ocean grid data. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import numpy as np diff --git a/lib/iris/tests/system_test.py b/lib/iris/tests/system_test.py index 910c99d127..75434ed841 100644 --- a/lib/iris/tests/system_test.py +++ b/lib/iris/tests/system_test.py @@ -12,7 +12,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_abf.py b/lib/iris/tests/test_abf.py index 95b01d8c15..fecabd6f33 100644 --- a/lib/iris/tests/test_abf.py +++ b/lib/iris/tests/test_abf.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/test_aggregate_by.py b/lib/iris/tests/test_aggregate_by.py index c37b06cd9c..cad392a4be 100644 --- a/lib/iris/tests/test_aggregate_by.py +++ b/lib/iris/tests/test_aggregate_by.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/test_analysis.py b/lib/iris/tests/test_analysis.py index f3165b6a97..fa2ab9269e 100644 --- a/lib/iris/tests/test_analysis.py +++ b/lib/iris/tests/test_analysis.py @@ -5,7 +5,6 @@ # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/test_analysis_calculus.py b/lib/iris/tests/test_analysis_calculus.py index 964f766543..4c7eef9398 100644 --- a/lib/iris/tests/test_analysis_calculus.py +++ b/lib/iris/tests/test_analysis_calculus.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_basic_maths.py b/lib/iris/tests/test_basic_maths.py index 9a18108204..bf14821890 100644 --- a/lib/iris/tests/test_basic_maths.py +++ b/lib/iris/tests/test_basic_maths.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_cartography.py b/lib/iris/tests/test_cartography.py index 7b1d3f0609..d6f9d8858b 100644 --- a/lib/iris/tests/test_cartography.py +++ b/lib/iris/tests/test_cartography.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_cdm.py b/lib/iris/tests/test_cdm.py index bcb4d9c0ed..acde3b73d0 100644 --- a/lib/iris/tests/test_cdm.py +++ b/lib/iris/tests/test_cdm.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/test_cell.py b/lib/iris/tests/test_cell.py index 675ef04d65..f6baa6f680 100644 --- a/lib/iris/tests/test_cell.py +++ b/lib/iris/tests/test_cell.py @@ -5,7 +5,6 @@ # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_cf.py b/lib/iris/tests/test_cf.py index d873303e72..2e8609d438 100644 --- a/lib/iris/tests/test_cf.py +++ b/lib/iris/tests/test_cf.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_coding_standards.py b/lib/iris/tests/test_coding_standards.py index e490bd1d8f..b3635a4167 100644 --- a/lib/iris/tests/test_coding_standards.py +++ b/lib/iris/tests/test_coding_standards.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris.tests first so that some things can be initialised before @@ -281,65 +280,5 @@ def test_license_headers(self): raise ValueError('There were license header failures. See stdout.') -class TestFutureImports(tests.IrisTest): - excluded = ( - '*/iris/fileformats/_old_pp_packing.py', - '*/iris/fileformats/_pyke_rules/__init__.py', - '*/iris/fileformats/_pyke_rules/compiled_krb/__init__.py', - '*/iris/fileformats/_pyke_rules/compiled_krb/compiled_pyke_files.py', - '*/iris/fileformats/_pyke_rules/compiled_krb/fc_rules_cf_fc.py', - '*/docs/iris/example_code/*/*.py', - '*/docs/iris/src/examples/*/*.py', - '*/docs/iris/src/developers_guide/documenting/*.py', - ) - - future_imports_pattern = re.compile( - r"^from __future__ import \(absolute_import,\s*division,\s*" - r"print_function(,\s*unicode_literals)?\)$", - flags=re.MULTILINE) - - six_import_pattern = re.compile( - r"^from six.moves import \(filter, input, map, range, zip\) # noqa$", - flags=re.MULTILINE) - - def test_future_imports(self): - # Tests that every single Python file includes the appropriate - # __future__ import to enforce consistent behaviour. - check_paths = [os.path.dirname(iris.__file__)] - if DOCS_DIRS: - check_paths.extend(DOCS_DIRS) - - failed = False - for dirpath, _, files in chain.from_iterable(os.walk(path) - for path in check_paths): - for fname in files: - full_fname = os.path.join(dirpath, fname) - if not full_fname.endswith('.py'): - continue - if not os.path.isfile(full_fname): - continue - if any(fnmatch(full_fname, pat) for pat in self.excluded): - continue - - with open(full_fname, "r") as fh: - content = fh.read() - - if re.search(self.future_imports_pattern, content) is None: - print('The file {} has no valid __future__ imports ' - 'and has not been excluded from the imports ' - 'test.'.format(full_fname)) - failed = True - - if re.search(self.six_import_pattern, content) is None: - print('The file {} has no valid six import ' - 'and has not been excluded from the imports ' - 'test.'.format(full_fname)) - failed = True - - if failed: - raise AssertionError('There were Python 3 compatibility import ' - 'check failures. See stdout.') - - if __name__ == '__main__': tests.main() diff --git a/lib/iris/tests/test_concatenate.py b/lib/iris/tests/test_concatenate.py index e2b70f3b25..6b3c35651f 100644 --- a/lib/iris/tests/test_concatenate.py +++ b/lib/iris/tests/test_concatenate.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/test_constraints.py b/lib/iris/tests/test_constraints.py index e3dcc309ab..715a27c284 100644 --- a/lib/iris/tests/test_constraints.py +++ b/lib/iris/tests/test_constraints.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/test_coord_api.py b/lib/iris/tests/test_coord_api.py index 96428dc30d..c0144b3852 100644 --- a/lib/iris/tests/test_coord_api.py +++ b/lib/iris/tests/test_coord_api.py @@ -5,7 +5,6 @@ # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/test_coord_categorisation.py b/lib/iris/tests/test_coord_categorisation.py index ff3ba68f99..4a515869a6 100644 --- a/lib/iris/tests/test_coord_categorisation.py +++ b/lib/iris/tests/test_coord_categorisation.py @@ -7,7 +7,6 @@ Test the coordinate categorisation functions. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_coordsystem.py b/lib/iris/tests/test_coordsystem.py index 62120fa422..30cb30c0d6 100644 --- a/lib/iris/tests/test_coordsystem.py +++ b/lib/iris/tests/test_coordsystem.py @@ -5,7 +5,6 @@ # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_cube.py b/lib/iris/tests/test_cube.py index 2fe788fc75..fbf665ef6a 100644 --- a/lib/iris/tests/test_cube.py +++ b/lib/iris/tests/test_cube.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/test_cube_to_pp.py b/lib/iris/tests/test_cube_to_pp.py index b020a9289d..cd2b2aed83 100644 --- a/lib/iris/tests/test_cube_to_pp.py +++ b/lib/iris/tests/test_cube_to_pp.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/test_ff.py b/lib/iris/tests/test_ff.py index 64c6d45fd8..258e4d1cda 100644 --- a/lib/iris/tests/test_ff.py +++ b/lib/iris/tests/test_ff.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/test_file_load.py b/lib/iris/tests/test_file_load.py index 3235fe7c1e..f71b267d25 100644 --- a/lib/iris/tests/test_file_load.py +++ b/lib/iris/tests/test_file_load.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_file_save.py b/lib/iris/tests/test_file_save.py index b5e59e1fdb..7e6eab40b0 100644 --- a/lib/iris/tests/test_file_save.py +++ b/lib/iris/tests/test_file_save.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/test_grib_load_translations.py b/lib/iris/tests/test_grib_load_translations.py index 4696754ae5..c98616f0f7 100644 --- a/lib/iris/tests/test_grib_load_translations.py +++ b/lib/iris/tests/test_grib_load_translations.py @@ -7,7 +7,6 @@ Tests for specific implementation aspects of the grib loaders. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/test_grib_save.py b/lib/iris/tests/test_grib_save.py index 37798b72d6..526ca19843 100644 --- a/lib/iris/tests/test_grib_save.py +++ b/lib/iris/tests/test_grib_save.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_grib_save_rules.py b/lib/iris/tests/test_grib_save_rules.py index fe0e4e34de..895d20a86e 100644 --- a/lib/iris/tests/test_grib_save_rules.py +++ b/lib/iris/tests/test_grib_save_rules.py @@ -5,7 +5,6 @@ # licensing details. """Integration tests for :mod:`iris_grib._save_rules`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_hybrid.py b/lib/iris/tests/test_hybrid.py index 1dfcc86780..30f32091e1 100644 --- a/lib/iris/tests/test_hybrid.py +++ b/lib/iris/tests/test_hybrid.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/test_image_json.py b/lib/iris/tests/test_image_json.py index e5baee2f62..151a22f41b 100644 --- a/lib/iris/tests/test_image_json.py +++ b/lib/iris/tests/test_image_json.py @@ -5,7 +5,6 @@ # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/test_intersect.py b/lib/iris/tests/test_intersect.py index c30a85dafd..92badecd69 100644 --- a/lib/iris/tests/test_intersect.py +++ b/lib/iris/tests/test_intersect.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_io_init.py b/lib/iris/tests/test_io_init.py index 140195b64b..4967cfd44f 100644 --- a/lib/iris/tests/test_io_init.py +++ b/lib/iris/tests/test_io_init.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_iterate.py b/lib/iris/tests/test_iterate.py index 7f4b2ba073..8850c115f4 100644 --- a/lib/iris/tests/test_iterate.py +++ b/lib/iris/tests/test_iterate.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/test_load.py b/lib/iris/tests/test_load.py index cc93d545f5..c67e2b30e0 100644 --- a/lib/iris/tests/test_load.py +++ b/lib/iris/tests/test_load.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_mapping.py b/lib/iris/tests/test_mapping.py index f941a421b3..9411e6e3cb 100644 --- a/lib/iris/tests/test_mapping.py +++ b/lib/iris/tests/test_mapping.py @@ -7,7 +7,6 @@ Tests map creation. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/test_merge.py b/lib/iris/tests/test_merge.py index 9735aaa646..a551676bbb 100644 --- a/lib/iris/tests/test_merge.py +++ b/lib/iris/tests/test_merge.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/test_name.py b/lib/iris/tests/test_name.py index b4b3e16f15..1f76a1310d 100644 --- a/lib/iris/tests/test_name.py +++ b/lib/iris/tests/test_name.py @@ -5,7 +5,6 @@ # licensing details. """Tests for NAME loading.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/test_netcdf.py b/lib/iris/tests/test_netcdf.py index 7cbb926e74..a115c8eb6b 100644 --- a/lib/iris/tests/test_netcdf.py +++ b/lib/iris/tests/test_netcdf.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/test_nimrod.py b/lib/iris/tests/test_nimrod.py index 18c0d00c30..9f4ad805f6 100644 --- a/lib/iris/tests/test_nimrod.py +++ b/lib/iris/tests/test_nimrod.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/test_pandas.py b/lib/iris/tests/test_pandas.py index be5372543a..d7d12a9a0e 100644 --- a/lib/iris/tests/test_pandas.py +++ b/lib/iris/tests/test_pandas.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/test_peak.py b/lib/iris/tests/test_peak.py index 02935af9d1..6864f1b6ce 100644 --- a/lib/iris/tests/test_peak.py +++ b/lib/iris/tests/test_peak.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import iris.analysis diff --git a/lib/iris/tests/test_pickling.py b/lib/iris/tests/test_pickling.py index 940b35a297..97e86da90a 100644 --- a/lib/iris/tests/test_pickling.py +++ b/lib/iris/tests/test_pickling.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/test_plot.py b/lib/iris/tests/test_plot.py index 7e70901fbb..f08acc172d 100644 --- a/lib/iris/tests/test_plot.py +++ b/lib/iris/tests/test_plot.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/test_pp_cf.py b/lib/iris/tests/test_pp_cf.py index 03c22fb738..19301e20be 100644 --- a/lib/iris/tests/test_pp_cf.py +++ b/lib/iris/tests/test_pp_cf.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_pp_module.py b/lib/iris/tests/test_pp_module.py index 5fadf7d944..da7a801226 100644 --- a/lib/iris/tests/test_pp_module.py +++ b/lib/iris/tests/test_pp_module.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_pp_stash.py b/lib/iris/tests/test_pp_stash.py index b4521cc24a..c6528b15c5 100644 --- a/lib/iris/tests/test_pp_stash.py +++ b/lib/iris/tests/test_pp_stash.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_pp_to_cube.py b/lib/iris/tests/test_pp_to_cube.py index d3292cb936..558301bdc4 100644 --- a/lib/iris/tests/test_pp_to_cube.py +++ b/lib/iris/tests/test_pp_to_cube.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_quickplot.py b/lib/iris/tests/test_quickplot.py index 7bb8f0300e..2eed7e0436 100644 --- a/lib/iris/tests/test_quickplot.py +++ b/lib/iris/tests/test_quickplot.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_std_names.py b/lib/iris/tests/test_std_names.py index b70f8fe75b..5163dd2237 100644 --- a/lib/iris/tests/test_std_names.py +++ b/lib/iris/tests/test_std_names.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_uri_callback.py b/lib/iris/tests/test_uri_callback.py index 2b71600f54..39a2d370ab 100644 --- a/lib/iris/tests/test_uri_callback.py +++ b/lib/iris/tests/test_uri_callback.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before importing anything else diff --git a/lib/iris/tests/test_util.py b/lib/iris/tests/test_util.py index 573aa0053d..2df4778e7b 100644 --- a/lib/iris/tests/test_util.py +++ b/lib/iris/tests/test_util.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/test_whatsnew_contributions.py b/lib/iris/tests/test_whatsnew_contributions.py index fc9d44051e..742098fbbe 100644 --- a/lib/iris/tests/test_whatsnew_contributions.py +++ b/lib/iris/tests/test_whatsnew_contributions.py @@ -19,7 +19,6 @@ invokes the checking command directly. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first. diff --git a/lib/iris/tests/unit/__init__.py b/lib/iris/tests/unit/__init__.py index 10861d8f33..8aa372e7f0 100644 --- a/lib/iris/tests/unit/__init__.py +++ b/lib/iris/tests/unit/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/analysis/__init__.py b/lib/iris/tests/unit/analysis/__init__.py index 0fdb3256e0..354136f500 100644 --- a/lib/iris/tests/unit/analysis/__init__.py +++ b/lib/iris/tests/unit/analysis/__init__.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :mod:`iris.analysis` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/area_weighted/__init__.py b/lib/iris/tests/unit/analysis/area_weighted/__init__.py index 5fc03eb3d8..f71d333ff3 100644 --- a/lib/iris/tests/unit/analysis/area_weighted/__init__.py +++ b/lib/iris/tests/unit/analysis/area_weighted/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.analysis._area_weighted` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/analysis/area_weighted/test_AreaWeightedRegridder.py b/lib/iris/tests/unit/analysis/area_weighted/test_AreaWeightedRegridder.py index 0560e15008..402a5e94bf 100644 --- a/lib/iris/tests/unit/analysis/area_weighted/test_AreaWeightedRegridder.py +++ b/lib/iris/tests/unit/analysis/area_weighted/test_AreaWeightedRegridder.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/cartography/__init__.py b/lib/iris/tests/unit/analysis/cartography/__init__.py index 110c6d50de..57155636e5 100644 --- a/lib/iris/tests/unit/analysis/cartography/__init__.py +++ b/lib/iris/tests/unit/analysis/cartography/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.analysis.cartography` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/analysis/cartography/test__quadrant_area.py b/lib/iris/tests/unit/analysis/cartography/test__quadrant_area.py index ee4a958d78..db34711dee 100644 --- a/lib/iris/tests/unit/analysis/cartography/test__quadrant_area.py +++ b/lib/iris/tests/unit/analysis/cartography/test__quadrant_area.py @@ -6,7 +6,6 @@ """Unit tests for the `iris.analysis.cartography._quadrant_area` function""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/cartography/test__xy_range.py b/lib/iris/tests/unit/analysis/cartography/test__xy_range.py index 33ff791233..d550fcf527 100644 --- a/lib/iris/tests/unit/analysis/cartography/test__xy_range.py +++ b/lib/iris/tests/unit/analysis/cartography/test__xy_range.py @@ -9,7 +9,6 @@ # Import iris.tests first so that some things can be initialised before # importing anything else. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import iris.tests as tests diff --git a/lib/iris/tests/unit/analysis/cartography/test_area_weights.py b/lib/iris/tests/unit/analysis/cartography/test_area_weights.py index 7f4b31afb6..04e96e782c 100644 --- a/lib/iris/tests/unit/analysis/cartography/test_area_weights.py +++ b/lib/iris/tests/unit/analysis/cartography/test_area_weights.py @@ -9,7 +9,6 @@ # Import iris.tests first so that some things can be initialised before # importing anything else. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import iris.tests as tests import iris.tests.stock as stock diff --git a/lib/iris/tests/unit/analysis/cartography/test_gridcell_angles.py b/lib/iris/tests/unit/analysis/cartography/test_gridcell_angles.py index a08ac8e563..a2927ee7be 100644 --- a/lib/iris/tests/unit/analysis/cartography/test_gridcell_angles.py +++ b/lib/iris/tests/unit/analysis/cartography/test_gridcell_angles.py @@ -8,7 +8,6 @@ :func:`iris.analysis.cartography.gridcell_angles`. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/cartography/test_project.py b/lib/iris/tests/unit/analysis/cartography/test_project.py index 7724980e44..491f06e07d 100644 --- a/lib/iris/tests/unit/analysis/cartography/test_project.py +++ b/lib/iris/tests/unit/analysis/cartography/test_project.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :func:`iris.analysis.cartography.project`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/cartography/test_rotate_grid_vectors.py b/lib/iris/tests/unit/analysis/cartography/test_rotate_grid_vectors.py index 93f934e451..9d0dcf79dd 100644 --- a/lib/iris/tests/unit/analysis/cartography/test_rotate_grid_vectors.py +++ b/lib/iris/tests/unit/analysis/cartography/test_rotate_grid_vectors.py @@ -8,7 +8,6 @@ :func:`iris.analysis.cartography.rotate_grid_vectors`. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/cartography/test_rotate_winds.py b/lib/iris/tests/unit/analysis/cartography/test_rotate_winds.py index 703122d177..52ba4822dd 100644 --- a/lib/iris/tests/unit/analysis/cartography/test_rotate_winds.py +++ b/lib/iris/tests/unit/analysis/cartography/test_rotate_winds.py @@ -8,7 +8,6 @@ :func:`iris.analysis.cartography.rotate_winds`. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/geometry/__init__.py b/lib/iris/tests/unit/analysis/geometry/__init__.py index 385bdee6cf..fa3c2df2d3 100644 --- a/lib/iris/tests/unit/analysis/geometry/__init__.py +++ b/lib/iris/tests/unit/analysis/geometry/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.analysis.geometry` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/analysis/geometry/test__extract_relevant_cube_slice.py b/lib/iris/tests/unit/analysis/geometry/test__extract_relevant_cube_slice.py index 32a0b11f2f..56ba1e8010 100644 --- a/lib/iris/tests/unit/analysis/geometry/test__extract_relevant_cube_slice.py +++ b/lib/iris/tests/unit/analysis/geometry/test__extract_relevant_cube_slice.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/geometry/test_geometry_area_weights.py b/lib/iris/tests/unit/analysis/geometry/test_geometry_area_weights.py index 5e72ac5c15..9a48a0927f 100644 --- a/lib/iris/tests/unit/analysis/geometry/test_geometry_area_weights.py +++ b/lib/iris/tests/unit/analysis/geometry/test_geometry_area_weights.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/interpolation/__init__.py b/lib/iris/tests/unit/analysis/interpolation/__init__.py index 94940b0491..c7d5063917 100644 --- a/lib/iris/tests/unit/analysis/interpolation/__init__.py +++ b/lib/iris/tests/unit/analysis/interpolation/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.analysis._interpolation` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/analysis/interpolation/test_RectilinearInterpolator.py b/lib/iris/tests/unit/analysis/interpolation/test_RectilinearInterpolator.py index 1e0304c8bb..3fda059999 100644 --- a/lib/iris/tests/unit/analysis/interpolation/test_RectilinearInterpolator.py +++ b/lib/iris/tests/unit/analysis/interpolation/test_RectilinearInterpolator.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/interpolation/test_get_xy_dim_coords.py b/lib/iris/tests/unit/analysis/interpolation/test_get_xy_dim_coords.py index 9224cb56b7..6cac1dd58f 100644 --- a/lib/iris/tests/unit/analysis/interpolation/test_get_xy_dim_coords.py +++ b/lib/iris/tests/unit/analysis/interpolation/test_get_xy_dim_coords.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/unit/analysis/maths/__init__.py b/lib/iris/tests/unit/analysis/maths/__init__.py index f213c2805b..9ceedb826b 100644 --- a/lib/iris/tests/unit/analysis/maths/__init__.py +++ b/lib/iris/tests/unit/analysis/maths/__init__.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :mod:`iris.analysis.maths` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/analysis/maths/test__get_dtype.py b/lib/iris/tests/unit/analysis/maths/test__get_dtype.py index f0d57e9bf6..1224344188 100644 --- a/lib/iris/tests/unit/analysis/maths/test__get_dtype.py +++ b/lib/iris/tests/unit/analysis/maths/test__get_dtype.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/maths/test__inplace_common_checks.py b/lib/iris/tests/unit/analysis/maths/test__inplace_common_checks.py index 102ae4d56e..34405306c2 100644 --- a/lib/iris/tests/unit/analysis/maths/test__inplace_common_checks.py +++ b/lib/iris/tests/unit/analysis/maths/test__inplace_common_checks.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/maths/test__output_dtype.py b/lib/iris/tests/unit/analysis/maths/test__output_dtype.py index 39c74a234a..2f56a8d203 100644 --- a/lib/iris/tests/unit/analysis/maths/test__output_dtype.py +++ b/lib/iris/tests/unit/analysis/maths/test__output_dtype.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/maths/test_add.py b/lib/iris/tests/unit/analysis/maths/test_add.py index b96a6016a4..192556aa17 100644 --- a/lib/iris/tests/unit/analysis/maths/test_add.py +++ b/lib/iris/tests/unit/analysis/maths/test_add.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :func:`iris.analysis.maths.add` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/maths/test_divide.py b/lib/iris/tests/unit/analysis/maths/test_divide.py index 1180be8845..5e26859894 100644 --- a/lib/iris/tests/unit/analysis/maths/test_divide.py +++ b/lib/iris/tests/unit/analysis/maths/test_divide.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :func:`iris.analysis.maths.divide` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/maths/test_multiply.py b/lib/iris/tests/unit/analysis/maths/test_multiply.py index 3f8cf53455..550a04b1cd 100644 --- a/lib/iris/tests/unit/analysis/maths/test_multiply.py +++ b/lib/iris/tests/unit/analysis/maths/test_multiply.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :func:`iris.analysis.maths.multiply` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/maths/test_subtract.py b/lib/iris/tests/unit/analysis/maths/test_subtract.py index 61517a750f..7d59b73840 100644 --- a/lib/iris/tests/unit/analysis/maths/test_subtract.py +++ b/lib/iris/tests/unit/analysis/maths/test_subtract.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :func:`iris.analysis.maths.subtract` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/regrid/__init__.py b/lib/iris/tests/unit/analysis/regrid/__init__.py index 7bef143e9e..920fd84ddc 100644 --- a/lib/iris/tests/unit/analysis/regrid/__init__.py +++ b/lib/iris/tests/unit/analysis/regrid/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.analysis._regrid` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py b/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py index 79c942bd82..6a8035c1b8 100644 --- a/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py +++ b/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :class:`iris.analysis._regrid.RectilinearRegridder`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/regrid/test__CurvilinearRegridder.py b/lib/iris/tests/unit/analysis/regrid/test__CurvilinearRegridder.py index 2a0cdd1f05..d54327bb9d 100644 --- a/lib/iris/tests/unit/analysis/regrid/test__CurvilinearRegridder.py +++ b/lib/iris/tests/unit/analysis/regrid/test__CurvilinearRegridder.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :class:`iris.analysis._regrid.CurvilinearRegridder`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/scipy_interpolate/test__RegularGridInterpolator.py b/lib/iris/tests/unit/analysis/scipy_interpolate/test__RegularGridInterpolator.py index 6576f37eda..9fb307af23 100644 --- a/lib/iris/tests/unit/analysis/scipy_interpolate/test__RegularGridInterpolator.py +++ b/lib/iris/tests/unit/analysis/scipy_interpolate/test__RegularGridInterpolator.py @@ -6,7 +6,6 @@ """Unit tests for the :func:`iris.analysis._scipy_interpolate._RegularGridInterpolator` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/stats/__init__.py b/lib/iris/tests/unit/analysis/stats/__init__.py index 8c258e4bb2..68eb9b1b04 100644 --- a/lib/iris/tests/unit/analysis/stats/__init__.py +++ b/lib/iris/tests/unit/analysis/stats/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.analysis.stats` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/analysis/stats/test_pearsonr.py b/lib/iris/tests/unit/analysis/stats/test_pearsonr.py index 125ea90374..a0e9f39585 100644 --- a/lib/iris/tests/unit/analysis/stats/test_pearsonr.py +++ b/lib/iris/tests/unit/analysis/stats/test_pearsonr.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.analysis.stats.pearsonr` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_Aggregator.py b/lib/iris/tests/unit/analysis/test_Aggregator.py index 3dd1437181..18dc2a2d9c 100644 --- a/lib/iris/tests/unit/analysis/test_Aggregator.py +++ b/lib/iris/tests/unit/analysis/test_Aggregator.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :class:`iris.analysis.Aggregator` class instance.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_AreaWeighted.py b/lib/iris/tests/unit/analysis/test_AreaWeighted.py index 0f0376eadf..eb2ef85683 100644 --- a/lib/iris/tests/unit/analysis/test_AreaWeighted.py +++ b/lib/iris/tests/unit/analysis/test_AreaWeighted.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :class:`iris.analysis.AreaWeighted`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_COUNT.py b/lib/iris/tests/unit/analysis/test_COUNT.py index baf723fccb..0f971d5a3b 100644 --- a/lib/iris/tests/unit/analysis/test_COUNT.py +++ b/lib/iris/tests/unit/analysis/test_COUNT.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :data:`iris.analysis.COUNT` aggregator.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_Linear.py b/lib/iris/tests/unit/analysis/test_Linear.py index 9db110ccb4..cce06f227c 100644 --- a/lib/iris/tests/unit/analysis/test_Linear.py +++ b/lib/iris/tests/unit/analysis/test_Linear.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :class:`iris.analysis.Linear`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_MAX.py b/lib/iris/tests/unit/analysis/test_MAX.py index 3d196af5bb..6e22dc52a2 100644 --- a/lib/iris/tests/unit/analysis/test_MAX.py +++ b/lib/iris/tests/unit/analysis/test_MAX.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :data:`iris.analysis.MAX` aggregator.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_MEAN.py b/lib/iris/tests/unit/analysis/test_MEAN.py index ce55a35358..806b064963 100644 --- a/lib/iris/tests/unit/analysis/test_MEAN.py +++ b/lib/iris/tests/unit/analysis/test_MEAN.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :data:`iris.analysis.MEAN` aggregator.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_MIN.py b/lib/iris/tests/unit/analysis/test_MIN.py index 7d2ce4b27f..cd55ed3d7b 100644 --- a/lib/iris/tests/unit/analysis/test_MIN.py +++ b/lib/iris/tests/unit/analysis/test_MIN.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :data:`iris.analysis.MIN` aggregator.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_Nearest.py b/lib/iris/tests/unit/analysis/test_Nearest.py index 72b04632bd..ea39a2e8f5 100644 --- a/lib/iris/tests/unit/analysis/test_Nearest.py +++ b/lib/iris/tests/unit/analysis/test_Nearest.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :class:`iris.analysis.Nearest`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_PERCENTILE.py b/lib/iris/tests/unit/analysis/test_PERCENTILE.py index 8b2d992a3c..75c9fb23d3 100644 --- a/lib/iris/tests/unit/analysis/test_PERCENTILE.py +++ b/lib/iris/tests/unit/analysis/test_PERCENTILE.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :data:`iris.analysis.PERCENTILE` aggregator.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_PROPORTION.py b/lib/iris/tests/unit/analysis/test_PROPORTION.py index 6189f8c5cd..95af98930a 100644 --- a/lib/iris/tests/unit/analysis/test_PROPORTION.py +++ b/lib/iris/tests/unit/analysis/test_PROPORTION.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :data:`iris.analysis.PROPORTION` aggregator.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_PercentileAggregator.py b/lib/iris/tests/unit/analysis/test_PercentileAggregator.py index 26f20380c3..890f23d96d 100644 --- a/lib/iris/tests/unit/analysis/test_PercentileAggregator.py +++ b/lib/iris/tests/unit/analysis/test_PercentileAggregator.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_PointInCell.py b/lib/iris/tests/unit/analysis/test_PointInCell.py index 9f3d1f4784..b7f3094faa 100644 --- a/lib/iris/tests/unit/analysis/test_PointInCell.py +++ b/lib/iris/tests/unit/analysis/test_PointInCell.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :class:`iris.analysis.PointInCell`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_RMS.py b/lib/iris/tests/unit/analysis/test_RMS.py index f9cccfc0d5..fbda374eb6 100644 --- a/lib/iris/tests/unit/analysis/test_RMS.py +++ b/lib/iris/tests/unit/analysis/test_RMS.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :data:`iris.analysis.RMS` aggregator.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_STD_DEV.py b/lib/iris/tests/unit/analysis/test_STD_DEV.py index 845984e2a7..4e4c789a9e 100644 --- a/lib/iris/tests/unit/analysis/test_STD_DEV.py +++ b/lib/iris/tests/unit/analysis/test_STD_DEV.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :data:`iris.analysis.STD_DEV` aggregator.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_SUM.py b/lib/iris/tests/unit/analysis/test_SUM.py index 397c1f15eb..01a9468dcc 100644 --- a/lib/iris/tests/unit/analysis/test_SUM.py +++ b/lib/iris/tests/unit/analysis/test_SUM.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :data:`iris.analysis.SUM` aggregator.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_VARIANCE.py b/lib/iris/tests/unit/analysis/test_VARIANCE.py index 3ccdc6b538..10c9c51712 100644 --- a/lib/iris/tests/unit/analysis/test_VARIANCE.py +++ b/lib/iris/tests/unit/analysis/test_VARIANCE.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :data:`iris.analysis.VARIANCE` aggregator.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_WPERCENTILE.py b/lib/iris/tests/unit/analysis/test_WPERCENTILE.py index e1f18e40e3..ba417d89c9 100644 --- a/lib/iris/tests/unit/analysis/test_WPERCENTILE.py +++ b/lib/iris/tests/unit/analysis/test_WPERCENTILE.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :data:`iris.analysis.PERCENTILE` aggregator.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/test_WeightedPercentileAggregator.py b/lib/iris/tests/unit/analysis/test_WeightedPercentileAggregator.py index bf73ed308d..d0ea70d1c7 100644 --- a/lib/iris/tests/unit/analysis/test_WeightedPercentileAggregator.py +++ b/lib/iris/tests/unit/analysis/test_WeightedPercentileAggregator.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/trajectory/__init__.py b/lib/iris/tests/unit/analysis/trajectory/__init__.py index 913bba2aed..644be35257 100644 --- a/lib/iris/tests/unit/analysis/trajectory/__init__.py +++ b/lib/iris/tests/unit/analysis/trajectory/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.analysis.trajectory` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/analysis/trajectory/test_Trajectory.py b/lib/iris/tests/unit/analysis/trajectory/test_Trajectory.py index 3ab302b937..6722c6f57c 100644 --- a/lib/iris/tests/unit/analysis/trajectory/test_Trajectory.py +++ b/lib/iris/tests/unit/analysis/trajectory/test_Trajectory.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/trajectory/test_UnstructuredNearestNeighbourRegridder.py b/lib/iris/tests/unit/analysis/trajectory/test_UnstructuredNearestNeighbourRegridder.py index 849de71af1..76e04d32cb 100644 --- a/lib/iris/tests/unit/analysis/trajectory/test_UnstructuredNearestNeighbourRegridder.py +++ b/lib/iris/tests/unit/analysis/trajectory/test_UnstructuredNearestNeighbourRegridder.py @@ -8,7 +8,6 @@ :class:`iris.analysis.trajectory.UnstructuredNearestNeigbourRegridder`. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/trajectory/test__nearest_neighbour_indices_ndcoords.py b/lib/iris/tests/unit/analysis/trajectory/test__nearest_neighbour_indices_ndcoords.py index 3e9faae1b7..56b40209eb 100644 --- a/lib/iris/tests/unit/analysis/trajectory/test__nearest_neighbour_indices_ndcoords.py +++ b/lib/iris/tests/unit/analysis/trajectory/test__nearest_neighbour_indices_ndcoords.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/analysis/trajectory/test_interpolate.py b/lib/iris/tests/unit/analysis/trajectory/test_interpolate.py index f4a168e818..f341bc6340 100644 --- a/lib/iris/tests/unit/analysis/trajectory/test_interpolate.py +++ b/lib/iris/tests/unit/analysis/trajectory/test_interpolate.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/aux_factory/__init__.py b/lib/iris/tests/unit/aux_factory/__init__.py index 1264c56758..685185af4b 100644 --- a/lib/iris/tests/unit/aux_factory/__init__.py +++ b/lib/iris/tests/unit/aux_factory/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.aux_factory` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/aux_factory/test_AuxCoordFactory.py b/lib/iris/tests/unit/aux_factory/test_AuxCoordFactory.py index 08c0fbfe23..4beb88371c 100644 --- a/lib/iris/tests/unit/aux_factory/test_AuxCoordFactory.py +++ b/lib/iris/tests/unit/aux_factory/test_AuxCoordFactory.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/aux_factory/test_HybridPressureFactory.py b/lib/iris/tests/unit/aux_factory/test_HybridPressureFactory.py index a1605a156f..76c202fdf3 100644 --- a/lib/iris/tests/unit/aux_factory/test_HybridPressureFactory.py +++ b/lib/iris/tests/unit/aux_factory/test_HybridPressureFactory.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/aux_factory/test_OceanSFactory.py b/lib/iris/tests/unit/aux_factory/test_OceanSFactory.py index 019c53ab9c..0e94cffe04 100644 --- a/lib/iris/tests/unit/aux_factory/test_OceanSFactory.py +++ b/lib/iris/tests/unit/aux_factory/test_OceanSFactory.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/aux_factory/test_OceanSg1Factory.py b/lib/iris/tests/unit/aux_factory/test_OceanSg1Factory.py index 8e55577c01..b08a04cea6 100644 --- a/lib/iris/tests/unit/aux_factory/test_OceanSg1Factory.py +++ b/lib/iris/tests/unit/aux_factory/test_OceanSg1Factory.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/aux_factory/test_OceanSg2Factory.py b/lib/iris/tests/unit/aux_factory/test_OceanSg2Factory.py index f0b8f9a3d2..88365ccb85 100644 --- a/lib/iris/tests/unit/aux_factory/test_OceanSg2Factory.py +++ b/lib/iris/tests/unit/aux_factory/test_OceanSg2Factory.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/aux_factory/test_OceanSigmaFactory.py b/lib/iris/tests/unit/aux_factory/test_OceanSigmaFactory.py index 13604b8a67..93dd5762fe 100644 --- a/lib/iris/tests/unit/aux_factory/test_OceanSigmaFactory.py +++ b/lib/iris/tests/unit/aux_factory/test_OceanSigmaFactory.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/aux_factory/test_OceanSigmaZFactory.py b/lib/iris/tests/unit/aux_factory/test_OceanSigmaZFactory.py index c135325081..dfc3823355 100644 --- a/lib/iris/tests/unit/aux_factory/test_OceanSigmaZFactory.py +++ b/lib/iris/tests/unit/aux_factory/test_OceanSigmaZFactory.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/concatenate/__init__.py b/lib/iris/tests/unit/concatenate/__init__.py index a20aa6f574..284ee3be1a 100644 --- a/lib/iris/tests/unit/concatenate/__init__.py +++ b/lib/iris/tests/unit/concatenate/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris._concatenate` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/concatenate/test__CubeSignature.py b/lib/iris/tests/unit/concatenate/test__CubeSignature.py index 16b554ab56..f33118c858 100644 --- a/lib/iris/tests/unit/concatenate/test__CubeSignature.py +++ b/lib/iris/tests/unit/concatenate/test__CubeSignature.py @@ -5,7 +5,6 @@ # licensing details. """Test class :class:`iris._concatenate._CubeSignature`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/unit/concatenate/test_concatenate.py b/lib/iris/tests/unit/concatenate/test_concatenate.py index fcf1d60b19..c535cdd4e7 100644 --- a/lib/iris/tests/unit/concatenate/test_concatenate.py +++ b/lib/iris/tests/unit/concatenate/test_concatenate.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris._concatenate.concatenate.py`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/unit/config/__init__.py b/lib/iris/tests/unit/config/__init__.py index 626092c56f..ceaf971f07 100644 --- a/lib/iris/tests/unit/config/__init__.py +++ b/lib/iris/tests/unit/config/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.config` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/config/test_NetCDF.py b/lib/iris/tests/unit/config/test_NetCDF.py index bcf6374944..33abf6c8ad 100644 --- a/lib/iris/tests/unit/config/test_NetCDF.py +++ b/lib/iris/tests/unit/config/test_NetCDF.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.config.NetCDF` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/coord_categorisation/__init__.py b/lib/iris/tests/unit/coord_categorisation/__init__.py index d069b04a46..dd2ef9fdb1 100644 --- a/lib/iris/tests/unit/coord_categorisation/__init__.py +++ b/lib/iris/tests/unit/coord_categorisation/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.coord_categorisation` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/coord_categorisation/test_add_categorised_coord.py b/lib/iris/tests/unit/coord_categorisation/test_add_categorised_coord.py index cd75bd6205..a49fee0259 100644 --- a/lib/iris/tests/unit/coord_categorisation/test_add_categorised_coord.py +++ b/lib/iris/tests/unit/coord_categorisation/test_add_categorised_coord.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.coord_categorisation.add_categorised_coord`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coord_categorisation/test_add_hour.py b/lib/iris/tests/unit/coord_categorisation/test_add_hour.py index 9f4ff221ff..d2c0774473 100644 --- a/lib/iris/tests/unit/coord_categorisation/test_add_hour.py +++ b/lib/iris/tests/unit/coord_categorisation/test_add_hour.py @@ -7,7 +7,6 @@ Test coordinate categorisation function add_hour. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coord_systems/__init__.py b/lib/iris/tests/unit/coord_systems/__init__.py index 1a4af3adc9..a2498300da 100644 --- a/lib/iris/tests/unit/coord_systems/__init__.py +++ b/lib/iris/tests/unit/coord_systems/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.coord_systems` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/coord_systems/test_AlbersEqualArea.py b/lib/iris/tests/unit/coord_systems/test_AlbersEqualArea.py index 69e498450e..4c238da9c8 100644 --- a/lib/iris/tests/unit/coord_systems/test_AlbersEqualArea.py +++ b/lib/iris/tests/unit/coord_systems/test_AlbersEqualArea.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coord_systems/test_Geostationary.py b/lib/iris/tests/unit/coord_systems/test_Geostationary.py index 3da93ad1b0..bee4f0c132 100644 --- a/lib/iris/tests/unit/coord_systems/test_Geostationary.py +++ b/lib/iris/tests/unit/coord_systems/test_Geostationary.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :class:`iris.coord_systems.Geostationary` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coord_systems/test_LambertAzimuthalEqualArea.py b/lib/iris/tests/unit/coord_systems/test_LambertAzimuthalEqualArea.py index 9f546a034e..e1a5248883 100644 --- a/lib/iris/tests/unit/coord_systems/test_LambertAzimuthalEqualArea.py +++ b/lib/iris/tests/unit/coord_systems/test_LambertAzimuthalEqualArea.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coord_systems/test_Mercator.py b/lib/iris/tests/unit/coord_systems/test_Mercator.py index 2d5d45d05d..bca4482ba3 100644 --- a/lib/iris/tests/unit/coord_systems/test_Mercator.py +++ b/lib/iris/tests/unit/coord_systems/test_Mercator.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :class:`iris.coord_systems.Mercator` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coord_systems/test_Orthographic.py b/lib/iris/tests/unit/coord_systems/test_Orthographic.py index 7cda0f0c2a..0fea64eb49 100644 --- a/lib/iris/tests/unit/coord_systems/test_Orthographic.py +++ b/lib/iris/tests/unit/coord_systems/test_Orthographic.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :class:`iris.coord_systems.Orthographic` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coord_systems/test_RotatedPole.py b/lib/iris/tests/unit/coord_systems/test_RotatedPole.py index 68e191cc7f..e5506c90ab 100644 --- a/lib/iris/tests/unit/coord_systems/test_RotatedPole.py +++ b/lib/iris/tests/unit/coord_systems/test_RotatedPole.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :class:`iris.coord_systems.RotatedPole` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coord_systems/test_VerticalPerspective.py b/lib/iris/tests/unit/coord_systems/test_VerticalPerspective.py index 2dbeef6ea6..b93701a3de 100644 --- a/lib/iris/tests/unit/coord_systems/test_VerticalPerspective.py +++ b/lib/iris/tests/unit/coord_systems/test_VerticalPerspective.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :class:`iris.coord_systems.VerticalPerspective` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coords/__init__.py b/lib/iris/tests/unit/coords/__init__.py index b6fc2d3a4a..e5f29ca220 100644 --- a/lib/iris/tests/unit/coords/__init__.py +++ b/lib/iris/tests/unit/coords/__init__.py @@ -11,7 +11,6 @@ :class:`~iris.tests.unit.coords.test_DimCoord`. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import dask.array as da diff --git a/lib/iris/tests/unit/coords/test_AncillaryVariable.py b/lib/iris/tests/unit/coords/test_AncillaryVariable.py index ddbb9de39f..b54726b046 100644 --- a/lib/iris/tests/unit/coords/test_AncillaryVariable.py +++ b/lib/iris/tests/unit/coords/test_AncillaryVariable.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :class:`iris.coords.AncillaryVariable` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coords/test_AuxCoord.py b/lib/iris/tests/unit/coords/test_AuxCoord.py index 6af4a8cf9a..4658679761 100644 --- a/lib/iris/tests/unit/coords/test_AuxCoord.py +++ b/lib/iris/tests/unit/coords/test_AuxCoord.py @@ -11,7 +11,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coords/test_Cell.py b/lib/iris/tests/unit/coords/test_Cell.py index 6ca189abb7..f339cf68fd 100644 --- a/lib/iris/tests/unit/coords/test_Cell.py +++ b/lib/iris/tests/unit/coords/test_Cell.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :class:`iris.coords.Cell` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coords/test_CellMeasure.py b/lib/iris/tests/unit/coords/test_CellMeasure.py index 06bd67ad6f..19a60e7b4d 100644 --- a/lib/iris/tests/unit/coords/test_CellMeasure.py +++ b/lib/iris/tests/unit/coords/test_CellMeasure.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :class:`iris.coords.CellMeasure` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coords/test_CellMethod.py b/lib/iris/tests/unit/coords/test_CellMethod.py index 4840e43437..a49b3da89f 100644 --- a/lib/iris/tests/unit/coords/test_CellMethod.py +++ b/lib/iris/tests/unit/coords/test_CellMethod.py @@ -7,7 +7,6 @@ Unit tests for the :class:`iris.coords.CellMethod`. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coords/test_Coord.py b/lib/iris/tests/unit/coords/test_Coord.py index c99cc6d4dd..1ca9d4de3d 100644 --- a/lib/iris/tests/unit/coords/test_Coord.py +++ b/lib/iris/tests/unit/coords/test_Coord.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. """Unit tests for the :class:`iris.coords.Coord` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/coords/test_DimCoord.py b/lib/iris/tests/unit/coords/test_DimCoord.py index d5a8776914..148f56ab2e 100644 --- a/lib/iris/tests/unit/coords/test_DimCoord.py +++ b/lib/iris/tests/unit/coords/test_DimCoord.py @@ -11,7 +11,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/cube/__init__.py b/lib/iris/tests/unit/cube/__init__.py index f74380765d..c0a40891f4 100644 --- a/lib/iris/tests/unit/cube/__init__.py +++ b/lib/iris/tests/unit/cube/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.cube` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/cube/test_Cube.py b/lib/iris/tests/unit/cube/test_Cube.py index 4d23fca869..a0cb33e214 100644 --- a/lib/iris/tests/unit/cube/test_Cube.py +++ b/lib/iris/tests/unit/cube/test_Cube.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.cube.Cube` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/cube/test_CubeList.py b/lib/iris/tests/unit/cube/test_CubeList.py index 1fab19e535..bee5c4be2f 100644 --- a/lib/iris/tests/unit/cube/test_CubeList.py +++ b/lib/iris/tests/unit/cube/test_CubeList.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.cube.CubeList` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/cube/test_Cube__operators.py b/lib/iris/tests/unit/cube/test_Cube__operators.py index b152f77346..7a4fef0863 100644 --- a/lib/iris/tests/unit/cube/test_Cube__operators.py +++ b/lib/iris/tests/unit/cube/test_Cube__operators.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.cube.Cube` class operators.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/unit/cube_coord_common/__init__.py b/lib/iris/tests/unit/cube_coord_common/__init__.py index 3369c5b896..9b768c10cd 100644 --- a/lib/iris/tests/unit/cube_coord_common/__init__.py +++ b/lib/iris/tests/unit/cube_coord_common/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris._cube_coord_common` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/cube_coord_common/test_CFVariableMixin.py b/lib/iris/tests/unit/cube_coord_common/test_CFVariableMixin.py index 86142a5484..b34eccaa9f 100644 --- a/lib/iris/tests/unit/cube_coord_common/test_CFVariableMixin.py +++ b/lib/iris/tests/unit/cube_coord_common/test_CFVariableMixin.py @@ -7,7 +7,6 @@ Unit tests for the :class:`iris._cube_coord_common.CFVariableMixin`. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/cube_coord_common/test_get_valid_standard_name.py b/lib/iris/tests/unit/cube_coord_common/test_get_valid_standard_name.py index 277ecb5f7c..8232202455 100644 --- a/lib/iris/tests/unit/cube_coord_common/test_get_valid_standard_name.py +++ b/lib/iris/tests/unit/cube_coord_common/test_get_valid_standard_name.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/data_manager/__init__.py b/lib/iris/tests/unit/data_manager/__init__.py index aee69777b4..0728d2f9d9 100644 --- a/lib/iris/tests/unit/data_manager/__init__.py +++ b/lib/iris/tests/unit/data_manager/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris._data_manager` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/data_manager/test_DataManager.py b/lib/iris/tests/unit/data_manager/test_DataManager.py index d43d3d5105..0bdcbfcff9 100644 --- a/lib/iris/tests/unit/data_manager/test_DataManager.py +++ b/lib/iris/tests/unit/data_manager/test_DataManager.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/experimental/__init__.py b/lib/iris/tests/unit/experimental/__init__.py index 7cc347b6c5..2df67beadb 100644 --- a/lib/iris/tests/unit/experimental/__init__.py +++ b/lib/iris/tests/unit/experimental/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.experimental` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/experimental/equalise_cubes/__init__.py b/lib/iris/tests/unit/experimental/equalise_cubes/__init__.py index f128635e04..b0101c31d6 100644 --- a/lib/iris/tests/unit/experimental/equalise_cubes/__init__.py +++ b/lib/iris/tests/unit/experimental/equalise_cubes/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the `iris.experimental.equalise_cubes` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/experimental/equalise_cubes/test_equalise_attributes.py b/lib/iris/tests/unit/experimental/equalise_cubes/test_equalise_attributes.py index eb733a0dfc..8b714f8d05 100644 --- a/lib/iris/tests/unit/experimental/equalise_cubes/test_equalise_attributes.py +++ b/lib/iris/tests/unit/experimental/equalise_cubes/test_equalise_attributes.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/unit/experimental/raster/__init__.py b/lib/iris/tests/unit/experimental/raster/__init__.py index 1fcfb6790a..57e8133918 100644 --- a/lib/iris/tests/unit/experimental/raster/__init__.py +++ b/lib/iris/tests/unit/experimental/raster/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.experimental.raster` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/experimental/raster/test_export_geotiff.py b/lib/iris/tests/unit/experimental/raster/test_export_geotiff.py index 729affe08b..969d55c09a 100644 --- a/lib/iris/tests/unit/experimental/raster/test_export_geotiff.py +++ b/lib/iris/tests/unit/experimental/raster/test_export_geotiff.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.experimental.raster.export_geotiff` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/experimental/regrid/__init__.py b/lib/iris/tests/unit/experimental/regrid/__init__.py index 6ee73dc0b0..3a55d4c39d 100644 --- a/lib/iris/tests/unit/experimental/regrid/__init__.py +++ b/lib/iris/tests/unit/experimental/regrid/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.experimental.regrid` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py b/lib/iris/tests/unit/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py index 9d4d92d264..724a7bbb37 100644 --- a/lib/iris/tests/unit/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py +++ b/lib/iris/tests/unit/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/experimental/regrid/test_regrid_weighted_curvilinear_to_rectilinear.py b/lib/iris/tests/unit/experimental/regrid/test_regrid_weighted_curvilinear_to_rectilinear.py index 53e1235925..393cbd7d28 100644 --- a/lib/iris/tests/unit/experimental/regrid/test_regrid_weighted_curvilinear_to_rectilinear.py +++ b/lib/iris/tests/unit/experimental/regrid/test_regrid_weighted_curvilinear_to_rectilinear.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/experimental/representation/__init__.py b/lib/iris/tests/unit/experimental/representation/__init__.py index 17c935b9d4..fa3f45443e 100644 --- a/lib/iris/tests/unit/experimental/representation/__init__.py +++ b/lib/iris/tests/unit/experimental/representation/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.experimental.representation` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/experimental/representation/test_CubeListRepresentation.py b/lib/iris/tests/unit/experimental/representation/test_CubeListRepresentation.py index 6fbcd6b978..e2c66efead 100644 --- a/lib/iris/tests/unit/experimental/representation/test_CubeListRepresentation.py +++ b/lib/iris/tests/unit/experimental/representation/test_CubeListRepresentation.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.cube.CubeRepresentation` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from html import escape diff --git a/lib/iris/tests/unit/experimental/representation/test_CubeRepresentation.py b/lib/iris/tests/unit/experimental/representation/test_CubeRepresentation.py index b18c9477c3..06b21728e9 100644 --- a/lib/iris/tests/unit/experimental/representation/test_CubeRepresentation.py +++ b/lib/iris/tests/unit/experimental/representation/test_CubeRepresentation.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.cube.CubeRepresentation` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from html import escape diff --git a/lib/iris/tests/unit/experimental/stratify/__init__.py b/lib/iris/tests/unit/experimental/stratify/__init__.py index e61a03eebd..9bcdff02bc 100644 --- a/lib/iris/tests/unit/experimental/stratify/__init__.py +++ b/lib/iris/tests/unit/experimental/stratify/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.experimental.stratify` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/experimental/stratify/test_relevel.py b/lib/iris/tests/unit/experimental/stratify/test_relevel.py index 03ce319790..5b9b4fd3a6 100644 --- a/lib/iris/tests/unit/experimental/stratify/test_relevel.py +++ b/lib/iris/tests/unit/experimental/stratify/test_relevel.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/__init__.py b/lib/iris/tests/unit/fileformats/__init__.py index ffac54b679..d13d670566 100644 --- a/lib/iris/tests/unit/fileformats/__init__.py +++ b/lib/iris/tests/unit/fileformats/__init__.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :mod:`iris.fileformats` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import iris.tests as tests diff --git a/lib/iris/tests/unit/fileformats/abf/__init__.py b/lib/iris/tests/unit/fileformats/abf/__init__.py index 087b57ff40..ce6fdd97a3 100644 --- a/lib/iris/tests/unit/fileformats/abf/__init__.py +++ b/lib/iris/tests/unit/fileformats/abf/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.fileformats.abf` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/abf/test_ABFField.py b/lib/iris/tests/unit/fileformats/abf/test_ABFField.py index 1365ed1f88..87641d72a5 100644 --- a/lib/iris/tests/unit/fileformats/abf/test_ABFField.py +++ b/lib/iris/tests/unit/fileformats/abf/test_ABFField.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.abf.ABFField` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/cf/__init__.py b/lib/iris/tests/unit/fileformats/cf/__init__.py index 074861433e..665cd211c9 100644 --- a/lib/iris/tests/unit/fileformats/cf/__init__.py +++ b/lib/iris/tests/unit/fileformats/cf/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.fileformats.cf` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/cf/test_CFReader.py b/lib/iris/tests/unit/fileformats/cf/test_CFReader.py index 842fb45bd5..8291ebc3bf 100644 --- a/lib/iris/tests/unit/fileformats/cf/test_CFReader.py +++ b/lib/iris/tests/unit/fileformats/cf/test_CFReader.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/dot/__init__.py b/lib/iris/tests/unit/fileformats/dot/__init__.py index a3e7b0fcc1..1fe028756a 100644 --- a/lib/iris/tests/unit/fileformats/dot/__init__.py +++ b/lib/iris/tests/unit/fileformats/dot/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for :mod:`iris.fileformats.dot`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa 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 c287fefda4..b960b34476 100644 --- a/lib/iris/tests/unit/fileformats/dot/test__dot_path.py +++ b/lib/iris/tests/unit/fileformats/dot/test__dot_path.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :func:`iris.fileformats.dot._dot_path`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/ff/__init__.py b/lib/iris/tests/unit/fileformats/ff/__init__.py index c9548e976a..769427bc02 100644 --- a/lib/iris/tests/unit/fileformats/ff/__init__.py +++ b/lib/iris/tests/unit/fileformats/ff/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.fileformats.ff` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/ff/test_ArakawaC.py b/lib/iris/tests/unit/fileformats/ff/test_ArakawaC.py index c85873f054..e5e3681175 100644 --- a/lib/iris/tests/unit/fileformats/ff/test_ArakawaC.py +++ b/lib/iris/tests/unit/fileformats/ff/test_ArakawaC.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :class:`iris.fileformat.ff.ArakawaC`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/ff/test_ENDGame.py b/lib/iris/tests/unit/fileformats/ff/test_ENDGame.py index 3b2d301692..7930a50ed5 100644 --- a/lib/iris/tests/unit/fileformats/ff/test_ENDGame.py +++ b/lib/iris/tests/unit/fileformats/ff/test_ENDGame.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :class:`iris.fileformat.ff.ENDGame`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/ff/test_FF2PP.py b/lib/iris/tests/unit/fileformats/ff/test_FF2PP.py index e715e63b13..39e65d18d6 100644 --- a/lib/iris/tests/unit/fileformats/ff/test_FF2PP.py +++ b/lib/iris/tests/unit/fileformats/ff/test_FF2PP.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :class:`iris.fileformat.ff.FF2PP` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/fileformats/ff/test_FFHeader.py b/lib/iris/tests/unit/fileformats/ff/test_FFHeader.py index 35a31fecc3..9239f016c5 100644 --- a/lib/iris/tests/unit/fileformats/ff/test_FFHeader.py +++ b/lib/iris/tests/unit/fileformats/ff/test_FFHeader.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :class:`iris.fileformat.ff.FFHeader`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/ff/test_Grid.py b/lib/iris/tests/unit/fileformats/ff/test_Grid.py index 57dc8c5d8b..e935e336ca 100644 --- a/lib/iris/tests/unit/fileformats/ff/test_Grid.py +++ b/lib/iris/tests/unit/fileformats/ff/test_Grid.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :class:`iris.fileformat.ff.Grid`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/ff/test_NewDynamics.py b/lib/iris/tests/unit/fileformats/ff/test_NewDynamics.py index 4722adda4a..855bdbbfc8 100644 --- a/lib/iris/tests/unit/fileformats/ff/test_NewDynamics.py +++ b/lib/iris/tests/unit/fileformats/ff/test_NewDynamics.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :class:`iris.fileformat.ff.NewDynamics`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/name_loaders/__init__.py b/lib/iris/tests/unit/fileformats/name_loaders/__init__.py index c6cac7bc1b..fede7b578f 100644 --- a/lib/iris/tests/unit/fileformats/name_loaders/__init__.py +++ b/lib/iris/tests/unit/fileformats/name_loaders/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.fileformats.name_loaders` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/name_loaders/test__build_cell_methods.py b/lib/iris/tests/unit/fileformats/name_loaders/test__build_cell_methods.py index 3afeb6ba4f..dfacf1c631 100644 --- a/lib/iris/tests/unit/fileformats/name_loaders/test__build_cell_methods.py +++ b/lib/iris/tests/unit/fileformats/name_loaders/test__build_cell_methods.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/name_loaders/test__calc_integration_period.py b/lib/iris/tests/unit/fileformats/name_loaders/test__calc_integration_period.py index fdba9e1c87..8af40ff1d4 100644 --- a/lib/iris/tests/unit/fileformats/name_loaders/test__calc_integration_period.py +++ b/lib/iris/tests/unit/fileformats/name_loaders/test__calc_integration_period.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/name_loaders/test__cf_height_from_name.py b/lib/iris/tests/unit/fileformats/name_loaders/test__cf_height_from_name.py index a36bbb668e..151e003f8a 100644 --- a/lib/iris/tests/unit/fileformats/name_loaders/test__cf_height_from_name.py +++ b/lib/iris/tests/unit/fileformats/name_loaders/test__cf_height_from_name.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/name_loaders/test__generate_cubes.py b/lib/iris/tests/unit/fileformats/name_loaders/test__generate_cubes.py index 6632b77a2a..5ac94a2300 100644 --- a/lib/iris/tests/unit/fileformats/name_loaders/test__generate_cubes.py +++ b/lib/iris/tests/unit/fileformats/name_loaders/test__generate_cubes.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/netcdf/__init__.py b/lib/iris/tests/unit/fileformats/netcdf/__init__.py index cd09ef690f..71f6d68a68 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/__init__.py +++ b/lib/iris/tests/unit/fileformats/netcdf/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.fileformats.netcdf` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/netcdf/test_Saver.py b/lib/iris/tests/unit/fileformats/netcdf/test_Saver.py index a0f59704b6..f52365aa25 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/test_Saver.py +++ b/lib/iris/tests/unit/fileformats/netcdf/test_Saver.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.netcdf.Saver` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/fileformats/netcdf/test__FillValueMaskCheckAndStoreTarget.py b/lib/iris/tests/unit/fileformats/netcdf/test__FillValueMaskCheckAndStoreTarget.py index 4ed474296b..a9383e793f 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/test__FillValueMaskCheckAndStoreTarget.py +++ b/lib/iris/tests/unit/fileformats/netcdf/test__FillValueMaskCheckAndStoreTarget.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/netcdf/test__get_cf_var_data.py b/lib/iris/tests/unit/fileformats/netcdf/test__get_cf_var_data.py index ffdf2acbfc..835f431556 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/test__get_cf_var_data.py +++ b/lib/iris/tests/unit/fileformats/netcdf/test__get_cf_var_data.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.netcdf._get_cf_var_data` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/netcdf/test__load_aux_factory.py b/lib/iris/tests/unit/fileformats/netcdf/test__load_aux_factory.py index 6d52315518..179dcc913c 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/test__load_aux_factory.py +++ b/lib/iris/tests/unit/fileformats/netcdf/test__load_aux_factory.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.netcdf._load_aux_factory` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/netcdf/test__load_cube.py b/lib/iris/tests/unit/fileformats/netcdf/test__load_cube.py index a51629cdf5..d081ea52eb 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/test__load_cube.py +++ b/lib/iris/tests/unit/fileformats/netcdf/test__load_cube.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.netcdf._load_cube` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/netcdf/test_parse_cell_methods.py b/lib/iris/tests/unit/fileformats/netcdf/test_parse_cell_methods.py index 2d2eb4f924..37610648ca 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/test_parse_cell_methods.py +++ b/lib/iris/tests/unit/fileformats/netcdf/test_parse_cell_methods.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/netcdf/test_save.py b/lib/iris/tests/unit/fileformats/netcdf/test_save.py index 7b16a69722..a14057e992 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/test_save.py +++ b/lib/iris/tests/unit/fileformats/netcdf/test_save.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.netcdf.save` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/nimrod_load_rules/__init__.py b/lib/iris/tests/unit/fileformats/nimrod_load_rules/__init__.py index ebb308a71b..aa3184d128 100644 --- a/lib/iris/tests/unit/fileformats/nimrod_load_rules/__init__.py +++ b/lib/iris/tests/unit/fileformats/nimrod_load_rules/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.fileformats.nimrod_load_rules` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/nimrod_load_rules/test_tm_meridian_scaling.py b/lib/iris/tests/unit/fileformats/nimrod_load_rules/test_tm_meridian_scaling.py index adece0f158..6d09c472f6 100644 --- a/lib/iris/tests/unit/fileformats/nimrod_load_rules/test_tm_meridian_scaling.py +++ b/lib/iris/tests/unit/fileformats/nimrod_load_rules/test_tm_meridian_scaling.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/nimrod_load_rules/test_vertical_coord.py b/lib/iris/tests/unit/fileformats/nimrod_load_rules/test_vertical_coord.py index 8b387c92b5..0be17e6ab2 100644 --- a/lib/iris/tests/unit/fileformats/nimrod_load_rules/test_vertical_coord.py +++ b/lib/iris/tests/unit/fileformats/nimrod_load_rules/test_vertical_coord.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp/__init__.py b/lib/iris/tests/unit/fileformats/pp/__init__.py index 5e33912487..54084efdeb 100644 --- a/lib/iris/tests/unit/fileformats/pp/__init__.py +++ b/lib/iris/tests/unit/fileformats/pp/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.fileformats.pp` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/pp/test_PPDataProxy.py b/lib/iris/tests/unit/fileformats/pp/test_PPDataProxy.py index 7c5e89a98c..47b1bded9a 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_PPDataProxy.py +++ b/lib/iris/tests/unit/fileformats/pp/test_PPDataProxy.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.pp.PPDataProxy` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp/test_PPField.py b/lib/iris/tests/unit/fileformats/pp/test_PPField.py index 0128f3c096..895bb84f3b 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_PPField.py +++ b/lib/iris/tests/unit/fileformats/pp/test_PPField.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.pp.PPField` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp/test__convert_constraints.py b/lib/iris/tests/unit/fileformats/pp/test__convert_constraints.py index a4a1a48119..d96c58f874 100644 --- a/lib/iris/tests/unit/fileformats/pp/test__convert_constraints.py +++ b/lib/iris/tests/unit/fileformats/pp/test__convert_constraints.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.pp.load` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp/test__create_field_data.py b/lib/iris/tests/unit/fileformats/pp/test__create_field_data.py index 382fc73b2e..2c7f0f9bb3 100644 --- a/lib/iris/tests/unit/fileformats/pp/test__create_field_data.py +++ b/lib/iris/tests/unit/fileformats/pp/test__create_field_data.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.pp._create_field_data` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp/test__data_bytes_to_shaped_array.py b/lib/iris/tests/unit/fileformats/pp/test__data_bytes_to_shaped_array.py index 9ec26b7dbf..b3cea6786f 100644 --- a/lib/iris/tests/unit/fileformats/pp/test__data_bytes_to_shaped_array.py +++ b/lib/iris/tests/unit/fileformats/pp/test__data_bytes_to_shaped_array.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp/test__field_gen.py b/lib/iris/tests/unit/fileformats/pp/test__field_gen.py index 12fc38c576..7d29026718 100644 --- a/lib/iris/tests/unit/fileformats/pp/test__field_gen.py +++ b/lib/iris/tests/unit/fileformats/pp/test__field_gen.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.pp._field_gen` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/fileformats/pp/test__interpret_field.py b/lib/iris/tests/unit/fileformats/pp/test__interpret_field.py index 34a2cc636a..0e4e19eca2 100644 --- a/lib/iris/tests/unit/fileformats/pp/test__interpret_field.py +++ b/lib/iris/tests/unit/fileformats/pp/test__interpret_field.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.pp._interpret_field` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp/test_as_fields.py b/lib/iris/tests/unit/fileformats/pp/test_as_fields.py index 7f868c665c..30a1cf07bb 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_as_fields.py +++ b/lib/iris/tests/unit/fileformats/pp/test_as_fields.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.pp.as_fields` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp/test_load.py b/lib/iris/tests/unit/fileformats/pp/test_load.py index 67b978d29c..f558ec0714 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_load.py +++ b/lib/iris/tests/unit/fileformats/pp/test_load.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.pp.load` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp/test_save.py b/lib/iris/tests/unit/fileformats/pp/test_save.py index 700813022e..bb1fec5648 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_save.py +++ b/lib/iris/tests/unit/fileformats/pp/test_save.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.pp.save` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import cftime diff --git a/lib/iris/tests/unit/fileformats/pp/test_save_fields.py b/lib/iris/tests/unit/fileformats/pp/test_save_fields.py index 8620ec8054..75e6ab0c58 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_save_fields.py +++ b/lib/iris/tests/unit/fileformats/pp/test_save_fields.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.pp.save_fields` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/fileformats/pp/test_save_pairs_from_cube.py b/lib/iris/tests/unit/fileformats/pp/test_save_pairs_from_cube.py index 9fabe4291e..20c796ec62 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_save_pairs_from_cube.py +++ b/lib/iris/tests/unit/fileformats/pp/test_save_pairs_from_cube.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.fileformats.pp.save_pairs_from_cube` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/__init__.py b/lib/iris/tests/unit/fileformats/pp_load_rules/__init__.py index 516246a823..fd34c23437 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/__init__.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.fileformats.pp_load_rules` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test__all_other_rules.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test__all_other_rules.py index 5a1d86e018..6e491d0c30 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/test__all_other_rules.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/test__all_other_rules.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test__collapse_degenerate_points_and_bounds.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test__collapse_degenerate_points_and_bounds.py index 48c0b2255b..5c8c13f6eb 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/test__collapse_degenerate_points_and_bounds.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/test__collapse_degenerate_points_and_bounds.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_scalar_pseudo_level_coords.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_scalar_pseudo_level_coords.py index 672f1f6413..1fe36c6c34 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_scalar_pseudo_level_coords.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_scalar_pseudo_level_coords.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_scalar_realization_coords.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_scalar_realization_coords.py index 3295b48265..6454ab75d6 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_scalar_realization_coords.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_scalar_realization_coords.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_time_coords.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_time_coords.py index 7ea92b26a3..215b217bb2 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_time_coords.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_time_coords.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_vertical_coords.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_vertical_coords.py index 432b4d214e..7c59d509c6 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_vertical_coords.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_vertical_coords.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test__dim_or_aux.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test__dim_or_aux.py index 5ee1abc403..d637ee1a57 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/test__dim_or_aux.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/test__dim_or_aux.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :func:`iris.fileformats.pp_load_rules._dim_or_aux`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test__epoch_date_hours.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test__epoch_date_hours.py index bfc6f92afe..02006fa277 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/test__epoch_date_hours.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/test__epoch_date_hours.py @@ -8,7 +8,6 @@ :func:`iris.fileformats.pp_load_rules._epoch_date_hours`. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test__model_level_number.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test__model_level_number.py index 13d87fe8af..c7b984a9aa 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/test__model_level_number.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/test__model_level_number.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test__reduced_points_and_bounds.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test__reduced_points_and_bounds.py index 77c11468d3..63dff23c7b 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/test__reduced_points_and_bounds.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/test__reduced_points_and_bounds.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test__reshape_vector_args.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test__reshape_vector_args.py index 7269d0bbe8..f94a487c21 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/test__reshape_vector_args.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/test__reshape_vector_args.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test_convert.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test_convert.py index 127c175b0d..c88239c7cb 100644 --- a/lib/iris/tests/unit/fileformats/pp_load_rules/test_convert.py +++ b/lib/iris/tests/unit/fileformats/pp_load_rules/test_convert.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :func:`iris.fileformats.pp_load_rules.convert`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/__init__.py b/lib/iris/tests/unit/fileformats/pyke_rules/__init__.py index 5f9b25c336..2c7385a984 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/__init__.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.fileformats._pyke_rules` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/__init__.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/__init__.py index 4275b53fe5..2b6ca01683 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/__init__.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/__init__.py @@ -8,5 +8,4 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/__init__.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/__init__.py index 966302b7b4..a29fc9dfa1 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/__init__.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.fileformats.fc_rules_cf_fc` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_auxiliary_coordinate.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_auxiliary_coordinate.py index e9cb6f73f7..d45592a34a 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_auxiliary_coordinate.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_auxiliary_coordinate.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_cube_metadata.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_cube_metadata.py index 9c2fbe318f..05a65e977b 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_cube_metadata.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_cube_metadata.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_dimension_coordinate.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_dimension_coordinate.py index 80e2bf99f6..02266330e8 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_dimension_coordinate.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_dimension_coordinate.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_geostationary_coordinate_system.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_geostationary_coordinate_system.py index 78c835f6d1..5a911644b1 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_geostationary_coordinate_system.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_geostationary_coordinate_system.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_mercator_coordinate_system.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_mercator_coordinate_system.py index 0dc4efc444..bf57ff13c8 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_mercator_coordinate_system.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_mercator_coordinate_system.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_stereographic_coordinate_system.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_stereographic_coordinate_system.py index 4570dadaf1..fe3dda9a3b 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_stereographic_coordinate_system.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_stereographic_coordinate_system.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_verticalp_coordinate_system.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_verticalp_coordinate_system.py index 96ff10d2d7..107141896c 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_verticalp_coordinate_system.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_verticalp_coordinate_system.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_get_attr_units.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_get_attr_units.py index e5a6b504e3..d39e729fab 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_get_attr_units.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_get_attr_units.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_get_cf_bounds_var.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_get_cf_bounds_var.py index c107affd26..df32813535 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_get_cf_bounds_var.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_get_cf_bounds_var.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_get_names.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_get_names.py index 8ed1f9f44f..f676ab920b 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_get_names.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_get_names.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_has_supported_mercator_parameters.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_has_supported_mercator_parameters.py index b4e5d1c97a..149856a4a1 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_has_supported_mercator_parameters.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_has_supported_mercator_parameters.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import warnings diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_has_supported_stereographic_parameters.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_has_supported_stereographic_parameters.py index baa01495ec..1b56c25074 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_has_supported_stereographic_parameters.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_has_supported_stereographic_parameters.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import warnings diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_reorder_bounds_data.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_reorder_bounds_data.py index 5334a16da8..af3d2760da 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_reorder_bounds_data.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_reorder_bounds_data.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/rules/__init__.py b/lib/iris/tests/unit/fileformats/rules/__init__.py index 997cf82055..e971967006 100644 --- a/lib/iris/tests/unit/fileformats/rules/__init__.py +++ b/lib/iris/tests/unit/fileformats/rules/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.fileformats.rules` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/rules/test_Loader.py b/lib/iris/tests/unit/fileformats/rules/test_Loader.py index e7d140c1dc..7f6b3dc41e 100644 --- a/lib/iris/tests/unit/fileformats/rules/test_Loader.py +++ b/lib/iris/tests/unit/fileformats/rules/test_Loader.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :class:`iris.fileformats.rules.Loader`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/rules/test__make_cube.py b/lib/iris/tests/unit/fileformats/rules/test__make_cube.py index e5543bd1b0..5abdb6cf79 100644 --- a/lib/iris/tests/unit/fileformats/rules/test__make_cube.py +++ b/lib/iris/tests/unit/fileformats/rules/test__make_cube.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :func:`iris.fileformats.rules._make_cube`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/structured_array_identification/__init__.py b/lib/iris/tests/unit/fileformats/structured_array_identification/__init__.py index 1a2db2fd12..daf2ada7e6 100644 --- a/lib/iris/tests/unit/fileformats/structured_array_identification/__init__.py +++ b/lib/iris/tests/unit/fileformats/structured_array_identification/__init__.py @@ -9,5 +9,4 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/structured_array_identification/test_ArrayStructure.py b/lib/iris/tests/unit/fileformats/structured_array_identification/test_ArrayStructure.py index 1554a583f4..c02ddd6925 100644 --- a/lib/iris/tests/unit/fileformats/structured_array_identification/test_ArrayStructure.py +++ b/lib/iris/tests/unit/fileformats/structured_array_identification/test_ArrayStructure.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/structured_array_identification/test_GroupStructure.py b/lib/iris/tests/unit/fileformats/structured_array_identification/test_GroupStructure.py index 56b039e2e5..68f0e90a45 100644 --- a/lib/iris/tests/unit/fileformats/structured_array_identification/test_GroupStructure.py +++ b/lib/iris/tests/unit/fileformats/structured_array_identification/test_GroupStructure.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/test_rules.py b/lib/iris/tests/unit/fileformats/test_rules.py index aa1b5845f2..13656038b0 100644 --- a/lib/iris/tests/unit/fileformats/test_rules.py +++ b/lib/iris/tests/unit/fileformats/test_rules.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/um/__init__.py b/lib/iris/tests/unit/fileformats/um/__init__.py index 65b0636360..6072b37250 100644 --- a/lib/iris/tests/unit/fileformats/um/__init__.py +++ b/lib/iris/tests/unit/fileformats/um/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the `iris.fileformats.um` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/um/fast_load/__init__.py b/lib/iris/tests/unit/fileformats/um/fast_load/__init__.py index 830a092dfb..8f3d79a26e 100644 --- a/lib/iris/tests/unit/fileformats/um/fast_load/__init__.py +++ b/lib/iris/tests/unit/fileformats/um/fast_load/__init__.py @@ -8,5 +8,4 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/um/fast_load/test_FieldCollation.py b/lib/iris/tests/unit/fileformats/um/fast_load/test_FieldCollation.py index a83e7cff7a..8c91de9ab3 100644 --- a/lib/iris/tests/unit/fileformats/um/fast_load/test_FieldCollation.py +++ b/lib/iris/tests/unit/fileformats/um/fast_load/test_FieldCollation.py @@ -13,7 +13,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/unit/fileformats/um/fast_load/test__convert_collation.py b/lib/iris/tests/unit/fileformats/um/fast_load/test__convert_collation.py index 3b834faaea..06f62b6e3b 100644 --- a/lib/iris/tests/unit/fileformats/um/fast_load/test__convert_collation.py +++ b/lib/iris/tests/unit/fileformats/um/fast_load/test__convert_collation.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :func:`iris.fileformats.um._fast_load._convert_collation`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/__init__.py b/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/__init__.py index 8b31bec5ea..6eb1ee5a99 100644 --- a/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/__init__.py +++ b/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/__init__.py @@ -9,5 +9,4 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_BasicFieldCollation.py b/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_BasicFieldCollation.py index 1bb9c6a30f..c36674bd97 100644 --- a/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_BasicFieldCollation.py +++ b/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_BasicFieldCollation.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_group_structured_fields.py b/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_group_structured_fields.py index 4eb4830fea..b24ef32a8c 100644 --- a/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_group_structured_fields.py +++ b/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_group_structured_fields.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/unit/fileformats/um/optimal_array_structuring/__init__.py b/lib/iris/tests/unit/fileformats/um/optimal_array_structuring/__init__.py index 50bd388b55..d909df57b9 100644 --- a/lib/iris/tests/unit/fileformats/um/optimal_array_structuring/__init__.py +++ b/lib/iris/tests/unit/fileformats/um/optimal_array_structuring/__init__.py @@ -9,5 +9,4 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/fileformats/um/optimal_array_structuring/test_optimal_array_structure.py b/lib/iris/tests/unit/fileformats/um/optimal_array_structuring/test_optimal_array_structure.py index 0de10a0bfc..da1aaa0598 100644 --- a/lib/iris/tests/unit/fileformats/um/optimal_array_structuring/test_optimal_array_structure.py +++ b/lib/iris/tests/unit/fileformats/um/optimal_array_structuring/test_optimal_array_structure.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised 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 92600fcb7b..f8acdf82ff 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 @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised diff --git a/lib/iris/tests/unit/io/__init__.py b/lib/iris/tests/unit/io/__init__.py index 08585a9bfd..5388d79428 100644 --- a/lib/iris/tests/unit/io/__init__.py +++ b/lib/iris/tests/unit/io/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.io` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/io/test_expand_filespecs.py b/lib/iris/tests/unit/io/test_expand_filespecs.py index 3e864ee6e6..47a9f9b687 100644 --- a/lib/iris/tests/unit/io/test_expand_filespecs.py +++ b/lib/iris/tests/unit/io/test_expand_filespecs.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.io.expand_filespecs` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/io/test_run_callback.py b/lib/iris/tests/unit/io/test_run_callback.py index ae7ce492bf..b771f59600 100644 --- a/lib/iris/tests/unit/io/test_run_callback.py +++ b/lib/iris/tests/unit/io/test_run_callback.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.io.run_callback` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/lazy_data/__init__.py b/lib/iris/tests/unit/lazy_data/__init__.py index 544171daca..7e685f5635 100644 --- a/lib/iris/tests/unit/lazy_data/__init__.py +++ b/lib/iris/tests/unit/lazy_data/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris._lazy_data` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/lazy_data/test_as_concrete_data.py b/lib/iris/tests/unit/lazy_data/test_as_concrete_data.py index 182ed1b5a8..3ab06c4b16 100644 --- a/lib/iris/tests/unit/lazy_data/test_as_concrete_data.py +++ b/lib/iris/tests/unit/lazy_data/test_as_concrete_data.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris._lazy data.as_concrete_data`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before 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 cfd82359c7..1205325a16 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 @@ -5,7 +5,6 @@ # licensing details. """Test the function :func:`iris._lazy data.as_lazy_data`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/lazy_data/test_co_realise_cubes.py b/lib/iris/tests/unit/lazy_data/test_co_realise_cubes.py index 758e565433..d3881aa78c 100644 --- a/lib/iris/tests/unit/lazy_data/test_co_realise_cubes.py +++ b/lib/iris/tests/unit/lazy_data/test_co_realise_cubes.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris._lazy data.co_realise_cubes`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/lazy_data/test_is_lazy_data.py b/lib/iris/tests/unit/lazy_data/test_is_lazy_data.py index 249f123a44..dd9966befb 100644 --- a/lib/iris/tests/unit/lazy_data/test_is_lazy_data.py +++ b/lib/iris/tests/unit/lazy_data/test_is_lazy_data.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris._lazy data.is_lazy_data`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/lazy_data/test_lazy_elementwise.py b/lib/iris/tests/unit/lazy_data/test_lazy_elementwise.py index 6b7b848786..64c413b6fe 100644 --- a/lib/iris/tests/unit/lazy_data/test_lazy_elementwise.py +++ b/lib/iris/tests/unit/lazy_data/test_lazy_elementwise.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris._lazy data.lazy_elementwise`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/lazy_data/test_multidim_lazy_stack.py b/lib/iris/tests/unit/lazy_data/test_multidim_lazy_stack.py index b9b592a760..532247994b 100644 --- a/lib/iris/tests/unit/lazy_data/test_multidim_lazy_stack.py +++ b/lib/iris/tests/unit/lazy_data/test_multidim_lazy_stack.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris._lazy data.multidim_lazy_stack`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/lazy_data/test_non_lazy.py b/lib/iris/tests/unit/lazy_data/test_non_lazy.py index a28d273f1d..c31cb5b3d3 100644 --- a/lib/iris/tests/unit/lazy_data/test_non_lazy.py +++ b/lib/iris/tests/unit/lazy_data/test_non_lazy.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris._lazy data.non_lazy`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/merge/__init__.py b/lib/iris/tests/unit/merge/__init__.py index a8b49dd36b..cf6010325a 100644 --- a/lib/iris/tests/unit/merge/__init__.py +++ b/lib/iris/tests/unit/merge/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris._merge` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/merge/test_ProtoCube.py b/lib/iris/tests/unit/merge/test_ProtoCube.py index 6a302eac21..bba214ba5c 100644 --- a/lib/iris/tests/unit/merge/test_ProtoCube.py +++ b/lib/iris/tests/unit/merge/test_ProtoCube.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris._merge.ProtoCube` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/plot/__init__.py b/lib/iris/tests/unit/plot/__init__.py index 19b97ece2b..b1062395fe 100644 --- a/lib/iris/tests/unit/plot/__init__.py +++ b/lib/iris/tests/unit/plot/__init__.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :mod:`iris.plot` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/_blockplot_common.py b/lib/iris/tests/unit/plot/_blockplot_common.py index 3643662431..78ee111063 100644 --- a/lib/iris/tests/unit/plot/_blockplot_common.py +++ b/lib/iris/tests/unit/plot/_blockplot_common.py @@ -5,7 +5,6 @@ # licensing details. """Common test code for `iris.plot.pcolor` and `iris.plot.pcolormesh`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test__check_bounds_contiguity_and_mask.py b/lib/iris/tests/unit/plot/test__check_bounds_contiguity_and_mask.py index 2ddbd8f7ad..ab967447cd 100644 --- a/lib/iris/tests/unit/plot/test__check_bounds_contiguity_and_mask.py +++ b/lib/iris/tests/unit/plot/test__check_bounds_contiguity_and_mask.py @@ -6,7 +6,6 @@ """Unit tests for the `iris.plot._check_bounds_contiguity_and_mask` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test__check_geostationary_coords_and_convert.py b/lib/iris/tests/unit/plot/test__check_geostationary_coords_and_convert.py index a60d1f3f5d..8a97746476 100644 --- a/lib/iris/tests/unit/plot/test__check_geostationary_coords_and_convert.py +++ b/lib/iris/tests/unit/plot/test__check_geostationary_coords_and_convert.py @@ -6,7 +6,6 @@ """Unit tests for the `iris.plot._check_geostationary_coords_and_convert function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test__fixup_dates.py b/lib/iris/tests/unit/plot/test__fixup_dates.py index 2dc95b5167..446eac4bca 100644 --- a/lib/iris/tests/unit/plot/test__fixup_dates.py +++ b/lib/iris/tests/unit/plot/test__fixup_dates.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.plot._fixup_dates` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test__get_plot_defn.py b/lib/iris/tests/unit/plot/test__get_plot_defn.py index 1781c6cbfb..9df1baa782 100644 --- a/lib/iris/tests/unit/plot/test__get_plot_defn.py +++ b/lib/iris/tests/unit/plot/test__get_plot_defn.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.plot._get_plot_defn` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test__get_plot_defn_custom_coords_picked.py b/lib/iris/tests/unit/plot/test__get_plot_defn_custom_coords_picked.py index f802866d78..519dc667ef 100644 --- a/lib/iris/tests/unit/plot/test__get_plot_defn_custom_coords_picked.py +++ b/lib/iris/tests/unit/plot/test__get_plot_defn_custom_coords_picked.py @@ -7,7 +7,6 @@ function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test_contour.py b/lib/iris/tests/unit/plot/test_contour.py index e10e51a882..6d48803843 100644 --- a/lib/iris/tests/unit/plot/test_contour.py +++ b/lib/iris/tests/unit/plot/test_contour.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.plot.contour` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test_contourf.py b/lib/iris/tests/unit/plot/test_contourf.py index c4aa842e10..1037665ad9 100644 --- a/lib/iris/tests/unit/plot/test_contourf.py +++ b/lib/iris/tests/unit/plot/test_contourf.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.plot.contourf` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test_outline.py b/lib/iris/tests/unit/plot/test_outline.py index e90b156193..910c2bd4a4 100644 --- a/lib/iris/tests/unit/plot/test_outline.py +++ b/lib/iris/tests/unit/plot/test_outline.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.plot.outline` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test_pcolor.py b/lib/iris/tests/unit/plot/test_pcolor.py index c98cac59bf..8882e04d3b 100644 --- a/lib/iris/tests/unit/plot/test_pcolor.py +++ b/lib/iris/tests/unit/plot/test_pcolor.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.plot.pcolor` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test_pcolormesh.py b/lib/iris/tests/unit/plot/test_pcolormesh.py index 50771a683b..7883eec14d 100644 --- a/lib/iris/tests/unit/plot/test_pcolormesh.py +++ b/lib/iris/tests/unit/plot/test_pcolormesh.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.plot.pcolormesh` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test_plot.py b/lib/iris/tests/unit/plot/test_plot.py index b3ddad5ca6..ca3f85ec28 100644 --- a/lib/iris/tests/unit/plot/test_plot.py +++ b/lib/iris/tests/unit/plot/test_plot.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.plot.plot` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test_points.py b/lib/iris/tests/unit/plot/test_points.py index dde292385c..d2e8018610 100644 --- a/lib/iris/tests/unit/plot/test_points.py +++ b/lib/iris/tests/unit/plot/test_points.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.plot.points` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/plot/test_scatter.py b/lib/iris/tests/unit/plot/test_scatter.py index 7c4a52b8ba..93f2bb4810 100644 --- a/lib/iris/tests/unit/plot/test_scatter.py +++ b/lib/iris/tests/unit/plot/test_scatter.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.plot.scatter` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/quickplot/__init__.py b/lib/iris/tests/unit/quickplot/__init__.py index 0523148df5..7c4facba87 100644 --- a/lib/iris/tests/unit/quickplot/__init__.py +++ b/lib/iris/tests/unit/quickplot/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.quickplot` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/quickplot/test_contour.py b/lib/iris/tests/unit/quickplot/test_contour.py index d6124af089..a41f4f79c2 100644 --- a/lib/iris/tests/unit/quickplot/test_contour.py +++ b/lib/iris/tests/unit/quickplot/test_contour.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.quickplot.contour` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/quickplot/test_contourf.py b/lib/iris/tests/unit/quickplot/test_contourf.py index 2237e2c334..e96ae8e0d2 100644 --- a/lib/iris/tests/unit/quickplot/test_contourf.py +++ b/lib/iris/tests/unit/quickplot/test_contourf.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.quickplot.contourf` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/quickplot/test_outline.py b/lib/iris/tests/unit/quickplot/test_outline.py index d7d6ec547c..3335423b47 100644 --- a/lib/iris/tests/unit/quickplot/test_outline.py +++ b/lib/iris/tests/unit/quickplot/test_outline.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.quickplot.outline` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/quickplot/test_pcolor.py b/lib/iris/tests/unit/quickplot/test_pcolor.py index af3e3d430d..c653abb143 100644 --- a/lib/iris/tests/unit/quickplot/test_pcolor.py +++ b/lib/iris/tests/unit/quickplot/test_pcolor.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.quickplot.pcolor` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/quickplot/test_pcolormesh.py b/lib/iris/tests/unit/quickplot/test_pcolormesh.py index c21912eafe..f0c602e83e 100644 --- a/lib/iris/tests/unit/quickplot/test_pcolormesh.py +++ b/lib/iris/tests/unit/quickplot/test_pcolormesh.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.quickplot.pcolormesh` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/quickplot/test_plot.py b/lib/iris/tests/unit/quickplot/test_plot.py index 2fdeb53f29..3b5bf17a72 100644 --- a/lib/iris/tests/unit/quickplot/test_plot.py +++ b/lib/iris/tests/unit/quickplot/test_plot.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.quickplot.plot` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/quickplot/test_points.py b/lib/iris/tests/unit/quickplot/test_points.py index 3a5a8f38a1..355f135c5a 100644 --- a/lib/iris/tests/unit/quickplot/test_points.py +++ b/lib/iris/tests/unit/quickplot/test_points.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.quickplot.points` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/quickplot/test_scatter.py b/lib/iris/tests/unit/quickplot/test_scatter.py index e6b52f4748..45afbf6f07 100644 --- a/lib/iris/tests/unit/quickplot/test_scatter.py +++ b/lib/iris/tests/unit/quickplot/test_scatter.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.quickplot.scatter` function.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/test_Future.py b/lib/iris/tests/unit/test_Future.py index 20adc0d6e9..1c5342ba09 100644 --- a/lib/iris/tests/unit/test_Future.py +++ b/lib/iris/tests/unit/test_Future.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.Future` class.""" -from __future__ import (absolute_import, division, print_function) import six from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/test_sample_data_path.py b/lib/iris/tests/unit/test_sample_data_path.py index e1a2c00063..7caf27e938 100644 --- a/lib/iris/tests/unit/test_sample_data_path.py +++ b/lib/iris/tests/unit/test_sample_data_path.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for :func:`iris.sample_data_path` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/tests/__init__.py b/lib/iris/tests/unit/tests/__init__.py index 27c481007a..e07177d798 100644 --- a/lib/iris/tests/unit/tests/__init__.py +++ b/lib/iris/tests/unit/tests/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.tests` package.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/tests/test_IrisTest.py b/lib/iris/tests/unit/tests/test_IrisTest.py index f601abc283..ba8c6f05a2 100644 --- a/lib/iris/tests/unit/tests/test_IrisTest.py +++ b/lib/iris/tests/unit/tests/test_IrisTest.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the :mod:`iris.tests.IrisTest` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/time/test_PartialDateTime.py b/lib/iris/tests/unit/time/test_PartialDateTime.py index 10a53b7d15..d52cd91a25 100644 --- a/lib/iris/tests/unit/time/test_PartialDateTime.py +++ b/lib/iris/tests/unit/time/test_PartialDateTime.py @@ -5,7 +5,6 @@ # licensing details. """Unit tests for the `iris.time.PartialDateTime` class.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/util/__init__.py b/lib/iris/tests/unit/util/__init__.py index 40187c5b9e..11315d4f40 100644 --- a/lib/iris/tests/unit/util/__init__.py +++ b/lib/iris/tests/unit/util/__init__.py @@ -5,5 +5,4 @@ # licensing details. """Unit tests for the :mod:`iris.util` module.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/tests/unit/util/test__coord_regular.py b/lib/iris/tests/unit/util/test__coord_regular.py index 93e448929b..fb075873bf 100644 --- a/lib/iris/tests/unit/util/test__coord_regular.py +++ b/lib/iris/tests/unit/util/test__coord_regular.py @@ -13,7 +13,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/util/test__is_circular.py b/lib/iris/tests/unit/util/test__is_circular.py index e51f87b238..7e72165829 100644 --- a/lib/iris/tests/unit/util/test__is_circular.py +++ b/lib/iris/tests/unit/util/test__is_circular.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util._is_circular`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test__slice_data_with_keys.py b/lib/iris/tests/unit/util/test__slice_data_with_keys.py index 30befa2813..2c8844109e 100644 --- a/lib/iris/tests/unit/util/test__slice_data_with_keys.py +++ b/lib/iris/tests/unit/util/test__slice_data_with_keys.py @@ -13,7 +13,6 @@ in combination. """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test_array_equal.py b/lib/iris/tests/unit/util/test_array_equal.py index 1d3202d6de..4b40d04196 100644 --- a/lib/iris/tests/unit/util/test_array_equal.py +++ b/lib/iris/tests/unit/util/test_array_equal.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.array_equal`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test_broadcast_to_shape.py b/lib/iris/tests/unit/util/test_broadcast_to_shape.py index 2656cf797e..c96f204ce4 100644 --- a/lib/iris/tests/unit/util/test_broadcast_to_shape.py +++ b/lib/iris/tests/unit/util/test_broadcast_to_shape.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.broadcast_to_shape`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test_column_slices_generator.py b/lib/iris/tests/unit/util/test_column_slices_generator.py index c66f736e2b..5f7343ca43 100644 --- a/lib/iris/tests/unit/util/test_column_slices_generator.py +++ b/lib/iris/tests/unit/util/test_column_slices_generator.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.column_slices_generator`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test_demote_dim_coord_to_aux_coord.py b/lib/iris/tests/unit/util/test_demote_dim_coord_to_aux_coord.py index ae0c5057a1..3fcf30c4a6 100644 --- a/lib/iris/tests/unit/util/test_demote_dim_coord_to_aux_coord.py +++ b/lib/iris/tests/unit/util/test_demote_dim_coord_to_aux_coord.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.demote_dim_coord_to_aux_coord`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test_describe_diff.py b/lib/iris/tests/unit/util/test_describe_diff.py index 288c16def1..66dfd1750a 100644 --- a/lib/iris/tests/unit/util/test_describe_diff.py +++ b/lib/iris/tests/unit/util/test_describe_diff.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.describe_diff`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/util/test_file_is_newer_than.py b/lib/iris/tests/unit/util/test_file_is_newer_than.py index 90ddc7c4c2..c86fa82cf8 100644 --- a/lib/iris/tests/unit/util/test_file_is_newer_than.py +++ b/lib/iris/tests/unit/util/test_file_is_newer_than.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/lib/iris/tests/unit/util/test_find_discontiguities.py b/lib/iris/tests/unit/util/test_find_discontiguities.py index 8ee1a7aabb..691a375926 100644 --- a/lib/iris/tests/unit/util/test_find_discontiguities.py +++ b/lib/iris/tests/unit/util/test_find_discontiguities.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.find_discontiguities""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test_mask_cube.py b/lib/iris/tests/unit/util/test_mask_cube.py index e81394878f..1ad0e1de53 100644 --- a/lib/iris/tests/unit/util/test_mask_cube.py +++ b/lib/iris/tests/unit/util/test_mask_cube.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.mask_cube""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test_new_axis.py b/lib/iris/tests/unit/util/test_new_axis.py index 6d8ff43381..be0f3dfa9e 100644 --- a/lib/iris/tests/unit/util/test_new_axis.py +++ b/lib/iris/tests/unit/util/test_new_axis.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.new_axis`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test_promote_aux_coord_to_dim_coord.py b/lib/iris/tests/unit/util/test_promote_aux_coord_to_dim_coord.py index ecd841fc15..c2dce5b6f6 100644 --- a/lib/iris/tests/unit/util/test_promote_aux_coord_to_dim_coord.py +++ b/lib/iris/tests/unit/util/test_promote_aux_coord_to_dim_coord.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.promote_aux_coord_to_dim_coord`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test_reverse.py b/lib/iris/tests/unit/util/test_reverse.py index 79620453d8..750862ccbd 100644 --- a/lib/iris/tests/unit/util/test_reverse.py +++ b/lib/iris/tests/unit/util/test_reverse.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.reverse`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test_rolling_window.py b/lib/iris/tests/unit/util/test_rolling_window.py index b832c4c323..03910ae9b6 100644 --- a/lib/iris/tests/unit/util/test_rolling_window.py +++ b/lib/iris/tests/unit/util/test_rolling_window.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.rolling_window`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test_squeeze.py b/lib/iris/tests/unit/util/test_squeeze.py index c9d4165cab..9e707c407f 100644 --- a/lib/iris/tests/unit/util/test_squeeze.py +++ b/lib/iris/tests/unit/util/test_squeeze.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.squeeze`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # Import iris.tests first so that some things can be initialised before diff --git a/lib/iris/tests/unit/util/test_unify_time_units.py b/lib/iris/tests/unit/util/test_unify_time_units.py index f03a83bde8..b7230974e9 100644 --- a/lib/iris/tests/unit/util/test_unify_time_units.py +++ b/lib/iris/tests/unit/util/test_unify_time_units.py @@ -5,7 +5,6 @@ # licensing details. """Test function :func:`iris.util.array_equal`.""" -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa # import iris tests first so that some things can be initialised before diff --git a/lib/iris/time.py b/lib/iris/time.py index 588de39cd6..8376d4bb3b 100644 --- a/lib/iris/time.py +++ b/lib/iris/time.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import functools diff --git a/lib/iris/util.py b/lib/iris/util.py index f8cc859cd2..369cec5eaa 100644 --- a/lib/iris/util.py +++ b/lib/iris/util.py @@ -8,7 +8,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six diff --git a/setup.py b/setup.py index 05982e6cb6..74e8852b76 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,3 @@ -from __future__ import print_function - from contextlib import contextmanager from distutils.util import convert_path import os diff --git a/tools/gen_helpers.py b/tools/gen_helpers.py index bc37e8e691..79164adfc7 100644 --- a/tools/gen_helpers.py +++ b/tools/gen_helpers.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from datetime import datetime diff --git a/tools/gen_stash_refs.py b/tools/gen_stash_refs.py index 659638363d..4aea8fd3cf 100644 --- a/tools/gen_stash_refs.py +++ b/tools/gen_stash_refs.py @@ -4,7 +4,6 @@ # See COPYING and COPYING.LESSER in the root of the repository for full # licensing details. -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import json @@ -25,9 +24,7 @@ ''' -CODE_PREAMBLE = ("\nfrom __future__ import " - "(absolute_import, division, print_function)\n" - "from six.moves import " +CODE_PREAMBLE = ("from six.moves import " "(filter, input, map, range, zip) # noqa\n\n" "from collections import namedtuple\n\n\n" "Stash = namedtuple('Stash', " diff --git a/tools/gen_translations.py b/tools/gen_translations.py index 2e6bdf4fd4..1902bab9b0 100644 --- a/tools/gen_translations.py +++ b/tools/gen_translations.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from datetime import datetime @@ -52,7 +51,6 @@ # https://github.com/metarelate/metOcean/commit/{git_sha} {doc_string} -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa from collections import namedtuple diff --git a/tools/generate_std_names.py b/tools/generate_std_names.py index 92073a6472..6cbf275c8f 100644 --- a/tools/generate_std_names.py +++ b/tools/generate_std_names.py @@ -17,7 +17,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six @@ -51,7 +50,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa diff --git a/tools/translator/__init__.py b/tools/translator/__init__.py index 1e8107ee19..a9afd0bcec 100644 --- a/tools/translator/__init__.py +++ b/tools/translator/__init__.py @@ -9,7 +9,6 @@ """ -from __future__ import (absolute_import, division, print_function) from six.moves import (filter, input, map, range, zip) # noqa import six