SciTools · bjlittle · Nov 5, 2019 · Oct 31, 2019 · Oct 31, 2019 · Nov 1, 2019
diff --git a/.stickler.yml b/.stickler.yml
@@ -1,5 +1,6 @@
 linters:
     flake8:
+        python: 3
 
 files:
     ignore:

diff --git a/docs/iris/example_code/Meteorology/COP_maps.py b/docs/iris/example_code/Meteorology/COP_maps.py
@@ -21,8 +21,6 @@
     doi:10.1029/2009EO210001.
 
 """
-from six.moves import zip
-
 import os.path
 import matplotlib.pyplot as plt
 import numpy as np

diff --git a/docs/iris/example_tests/__init__.py b/docs/iris/example_tests/__init__.py
@@ -3,5 +3,3 @@
 # This file is part of Iris and is released under the LGPL license.
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
-
-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
@@ -10,8 +10,6 @@
 
 """
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import contextlib
 import os.path
 import warnings

diff --git a/docs/iris/example_tests/test_COP_1d_plot.py b/docs/iris/example_tests/test_COP_1d_plot.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_COP_maps.py b/docs/iris/example_tests/test_COP_maps.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_SOI_filtering.py b/docs/iris/example_tests/test_SOI_filtering.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_TEC.py b/docs/iris/example_tests/test_TEC.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_anomaly_log_colouring.py b/docs/iris/example_tests/test_anomaly_log_colouring.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_atlantic_profiles.py b/docs/iris/example_tests/test_atlantic_profiles.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_coriolis_plot.py b/docs/iris/example_tests/test_coriolis_plot.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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/docs/iris/example_tests/test_cross_section.py b/docs/iris/example_tests/test_cross_section.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_custom_aggregation.py b/docs/iris/example_tests/test_custom_aggregation.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_custom_file_loading.py b/docs/iris/example_tests/test_custom_file_loading.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_deriving_phenomena.py b/docs/iris/example_tests/test_deriving_phenomena.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_global_map.py b/docs/iris/example_tests/test_global_map.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_hovmoller.py b/docs/iris/example_tests/test_hovmoller.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_inset_plot.py b/docs/iris/example_tests/test_inset_plot.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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/docs/iris/example_tests/test_lagged_ensemble.py b/docs/iris/example_tests/test_lagged_ensemble.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_lineplot_with_legend.py b/docs/iris/example_tests/test_lineplot_with_legend.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_load_nemo.py b/docs/iris/example_tests/test_load_nemo.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_orca_projection.py b/docs/iris/example_tests/test_orca_projection.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_polar_stereo.py b/docs/iris/example_tests/test_polar_stereo.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_polynomial_fit.py b/docs/iris/example_tests/test_polynomial_fit.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_projections_and_annotations.py b/docs/iris/example_tests/test_projections_and_annotations.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_rotated_pole_mapping.py b/docs/iris/example_tests/test_rotated_pole_mapping.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/example_tests/test_wind_speed.py b/docs/iris/example_tests/test_wind_speed.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-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.
 import iris.tests as tests

diff --git a/docs/iris/src/conf.py b/docs/iris/src/conf.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 # -*- coding: utf-8 -*-
 #
 # Iris documentation build configuration file, created by

diff --git a/docs/iris/src/developers_guide/gitwash_dumper.py b/docs/iris/src/developers_guide/gitwash_dumper.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 ''' Checkout gitwash repo into directory and do search replace on name '''
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import os
 from os.path import join as pjoin
 import shutil

diff --git a/docs/iris/src/sphinxext/auto_label_figures.py b/docs/iris/src/sphinxext/auto_label_figures.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import os
 from docutils import nodes
 

diff --git a/docs/iris/src/sphinxext/custom_class_autodoc.py b/docs/iris/src/sphinxext/custom_class_autodoc.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 from sphinx.ext import autodoc
 from sphinx.ext.autodoc import *
 from sphinx.util import force_decode

diff --git a/docs/iris/src/sphinxext/custom_data_autodoc.py b/docs/iris/src/sphinxext/custom_data_autodoc.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 from sphinx.ext.autodoc import DataDocumenter, ModuleLevelDocumenter
 try:
     # Use 'object_description' in place of the former 'safe_repr' function.

diff --git a/docs/iris/src/sphinxext/gen_example_directory.py b/docs/iris/src/sphinxext/gen_example_directory.py
@@ -9,8 +9,6 @@
 Generate the rst files for the examples
 '''
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import os
 import re
 import shutil

diff --git a/docs/iris/src/sphinxext/gen_gallery.py b/docs/iris/src/sphinxext/gen_gallery.py
@@ -6,8 +6,6 @@
 Generate a thumbnail gallery of examples.
 '''
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import os
 import glob
 import re

diff --git a/docs/iris/src/sphinxext/generate_package_rst.py b/docs/iris/src/sphinxext/generate_package_rst.py
@@ -4,8 +4,6 @@
 # See COPYING and COPYING.LESSER in the root of the repository for full
 # licensing details.
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import os
 import sys
 import re

diff --git a/docs/iris/src/userguide/plotting_examples/1d_quickplot_simple.py b/docs/iris/src/userguide/plotting_examples/1d_quickplot_simple.py
@@ -1,6 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import matplotlib.pyplot as plt
 
 import iris

diff --git a/docs/iris/src/userguide/plotting_examples/1d_simple.py b/docs/iris/src/userguide/plotting_examples/1d_simple.py
@@ -1,6 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import matplotlib.pyplot as plt
 
 import iris

diff --git a/docs/iris/src/userguide/plotting_examples/1d_with_legend.py b/docs/iris/src/userguide/plotting_examples/1d_with_legend.py
@@ -1,6 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import matplotlib.pyplot as plt
 
 import iris

diff --git a/docs/iris/src/userguide/plotting_examples/brewer.py b/docs/iris/src/userguide/plotting_examples/brewer.py
@@ -1,6 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import matplotlib.pyplot as plt
 import numpy as np
 

diff --git a/docs/iris/src/userguide/plotting_examples/cube_blockplot.py b/docs/iris/src/userguide/plotting_examples/cube_blockplot.py
@@ -1,6 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import matplotlib.pyplot as plt
 
 import iris

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
@@ -1,6 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import matplotlib.pyplot as plt
 
 import iris

diff --git a/docs/iris/src/userguide/plotting_examples/cube_brewer_contourf.py b/docs/iris/src/userguide/plotting_examples/cube_brewer_contourf.py
@@ -1,6 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import matplotlib.cm as mpl_cm
 import matplotlib.pyplot as plt
 

diff --git a/docs/iris/src/userguide/plotting_examples/cube_contour.py b/docs/iris/src/userguide/plotting_examples/cube_contour.py
@@ -1,6 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import matplotlib.pyplot as plt
 
 import iris

diff --git a/docs/iris/src/userguide/plotting_examples/cube_contourf.py b/docs/iris/src/userguide/plotting_examples/cube_contourf.py
@@ -1,6 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import matplotlib.pyplot as plt
 
 import iris

diff --git a/docs/iris/src/userguide/regridding_plots/interpolate_column.py b/docs/iris/src/userguide/regridding_plots/interpolate_column.py
@@ -1,6 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import iris
 import iris.quickplot as qplt
 import iris.analysis

diff --git a/docs/iris/src/userguide/regridding_plots/regridded_to_global.py b/docs/iris/src/userguide/regridding_plots/regridded_to_global.py
@@ -1,6 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import iris
 import iris.analysis
 import iris.plot as iplt

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
@@ -1,5 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
 
 import iris
 import iris.analysis

diff --git a/docs/iris/src/userguide/regridding_plots/regridded_to_rotated.py b/docs/iris/src/userguide/regridding_plots/regridded_to_rotated.py
@@ -1,6 +1,4 @@
 
-from six.moves import (filter, input, map, range, zip)  # noqa
-
 import iris
 import iris.analysis
 import iris.plot as iplt