From c61bde62a7db4c6a4b9da96f0be1c1511003b67d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 1 Jul 2015 02:56:05 -0400 Subject: [PATCH 1/2] py3k: Import six versions of builtins globally. --- docs/iris/example_tests/__init__.py | 3 ++- docs/iris/example_tests/extest_util.py | 3 ++- docs/iris/example_tests/test_COP_1d_plot.py | 3 ++- docs/iris/example_tests/test_COP_maps.py | 3 ++- docs/iris/example_tests/test_SOI_filtering.py | 3 ++- docs/iris/example_tests/test_TEC.py | 3 ++- docs/iris/example_tests/test_anomaly_log_colouring.py | 3 ++- docs/iris/example_tests/test_atlantic_profiles.py | 3 ++- docs/iris/example_tests/test_cross_section.py | 3 ++- docs/iris/example_tests/test_custom_aggregation.py | 3 ++- docs/iris/example_tests/test_custom_file_loading.py | 3 ++- docs/iris/example_tests/test_deriving_phenomena.py | 3 ++- docs/iris/example_tests/test_global_map.py | 3 ++- docs/iris/example_tests/test_hovmoller.py | 3 ++- docs/iris/example_tests/test_lagged_ensemble.py | 3 ++- docs/iris/example_tests/test_lineplot_with_legend.py | 3 ++- docs/iris/example_tests/test_orca_projection.py | 3 ++- docs/iris/example_tests/test_polar_stereo.py | 3 ++- docs/iris/example_tests/test_polynomial_fit.py | 1 + docs/iris/example_tests/test_projections_and_annotations.py | 3 ++- docs/iris/example_tests/test_rotated_pole_mapping.py | 3 ++- docs/iris/src/conf.py | 5 +++-- docs/iris/src/developers_guide/gitwash_dumper.py | 1 + docs/iris/src/sphinxext/auto_label_figures.py | 3 ++- docs/iris/src/sphinxext/custom_class_autodoc.py | 3 ++- docs/iris/src/sphinxext/custom_data_autodoc.py | 1 + docs/iris/src/sphinxext/gen_example_directory.py | 3 ++- docs/iris/src/sphinxext/gen_gallery.py | 1 + docs/iris/src/sphinxext/generate_package_rst.py | 2 +- .../src/userguide/plotting_examples/1d_quickplot_simple.py | 1 + docs/iris/src/userguide/plotting_examples/1d_simple.py | 1 + docs/iris/src/userguide/plotting_examples/1d_with_legend.py | 1 + docs/iris/src/userguide/plotting_examples/brewer.py | 1 + docs/iris/src/userguide/plotting_examples/cube_blockplot.py | 1 + .../plotting_examples/cube_brewer_cite_contourf.py | 1 + .../src/userguide/plotting_examples/cube_brewer_contourf.py | 1 + docs/iris/src/userguide/plotting_examples/cube_contour.py | 1 + docs/iris/src/userguide/plotting_examples/cube_contourf.py | 1 + .../src/userguide/regridding_plots/interpolate_column.py | 1 + .../src/userguide/regridding_plots/regridded_to_global.py | 1 + .../regridding_plots/regridded_to_global_area_weighted.py | 2 +- .../src/userguide/regridding_plots/regridded_to_rotated.py | 1 + docs/iris/src/userguide/regridding_plots/regridding_plot.py | 1 + docs/iris/src/whatsnew/aggregate_directory.py | 1 + lib/iris/__init__.py | 1 + lib/iris/_concatenate.py | 2 +- lib/iris/_constraints.py | 2 +- lib/iris/_cube_coord_common.py | 1 + lib/iris/_merge.py | 2 +- lib/iris/analysis/__init__.py | 2 +- lib/iris/analysis/_area_weighted.py | 3 ++- lib/iris/analysis/_interpolation.py | 2 +- lib/iris/analysis/_regrid.py | 1 + lib/iris/analysis/_scipy_interpolate.py | 2 +- lib/iris/analysis/calculus.py | 2 +- lib/iris/analysis/cartography.py | 2 +- lib/iris/analysis/geometry.py | 2 +- lib/iris/analysis/interpolate.py | 2 +- lib/iris/analysis/maths.py | 2 +- lib/iris/analysis/stats.py | 3 ++- lib/iris/analysis/trajectory.py | 2 +- lib/iris/aux_factory.py | 2 +- lib/iris/config.py | 3 ++- lib/iris/coord_categorisation.py | 2 +- lib/iris/coord_systems.py | 1 + lib/iris/coords.py | 2 +- lib/iris/cube.py | 2 +- lib/iris/exceptions.py | 3 ++- lib/iris/experimental/__init__.py | 3 ++- lib/iris/experimental/animate.py | 2 +- lib/iris/experimental/concatenate.py | 3 ++- lib/iris/experimental/equalise_cubes.py | 1 + lib/iris/experimental/fieldsfile.py | 2 +- lib/iris/experimental/raster.py | 3 ++- lib/iris/experimental/regrid.py | 2 +- lib/iris/experimental/regrid_conservative.py | 2 +- lib/iris/experimental/ugrid.py | 3 ++- lib/iris/experimental/um.py | 2 +- lib/iris/fileformats/__init__.py | 3 ++- lib/iris/fileformats/_ff_cross_references.py | 1 + lib/iris/fileformats/_structured_array_identification.py | 2 +- lib/iris/fileformats/abf.py | 3 ++- lib/iris/fileformats/cf.py | 1 + lib/iris/fileformats/dot.py | 3 ++- lib/iris/fileformats/ff.py | 2 +- lib/iris/fileformats/grib/__init__.py | 1 + lib/iris/fileformats/grib/_grib_cf_map.py | 1 + lib/iris/fileformats/grib/_load_convert.py | 1 + lib/iris/fileformats/grib/_message.py | 1 + lib/iris/fileformats/grib/_save_rules.py | 1 + lib/iris/fileformats/grib/grib_phenom_translation.py | 3 ++- lib/iris/fileformats/grib/grib_save_rules.py | 3 ++- lib/iris/fileformats/grib/load_rules.py | 1 + lib/iris/fileformats/name.py | 3 ++- lib/iris/fileformats/name_loaders.py | 2 +- lib/iris/fileformats/netcdf.py | 2 +- lib/iris/fileformats/nimrod.py | 3 ++- lib/iris/fileformats/nimrod_load_rules.py | 3 ++- lib/iris/fileformats/pp.py | 2 +- lib/iris/fileformats/pp_rules.py | 2 +- lib/iris/fileformats/rules.py | 2 +- lib/iris/fileformats/um/__init__.py | 3 ++- lib/iris/fileformats/um/_fast_load_structured_fields.py | 3 ++- lib/iris/fileformats/um/_optimal_array_structuring.py | 3 ++- lib/iris/fileformats/um_cf_map.py | 1 + lib/iris/io/__init__.py | 2 +- lib/iris/io/format_picker.py | 1 + lib/iris/iterate.py | 2 +- lib/iris/palette.py | 2 +- lib/iris/pandas.py | 3 ++- lib/iris/plot.py | 2 +- lib/iris/proxy.py | 3 ++- lib/iris/quickplot.py | 3 ++- lib/iris/symbols.py | 3 ++- lib/iris/tests/__init__.py | 2 +- lib/iris/tests/analysis/__init__.py | 3 ++- lib/iris/tests/analysis/test_interpolate.py | 1 + lib/iris/tests/analysis/test_stats.py | 3 ++- lib/iris/tests/experimental/__init__.py | 3 ++- lib/iris/tests/experimental/regrid/__init__.py | 3 ++- .../test_regrid_area_weighted_rectilinear_src_and_grid.py | 2 +- .../regrid/test_regrid_conservative_via_esmpy.py | 3 ++- lib/iris/tests/experimental/test_animate.py | 2 +- lib/iris/tests/experimental/test_fieldsfile.py | 3 ++- lib/iris/tests/experimental/test_raster.py | 3 ++- lib/iris/tests/experimental/ugrid/__init__.py | 3 ++- lib/iris/tests/experimental/ugrid/test_ugrid.py | 3 ++- lib/iris/tests/idiff.py | 3 ++- lib/iris/tests/integration/__init__.py | 3 ++- lib/iris/tests/integration/concatenate/__init__.py | 3 ++- lib/iris/tests/integration/concatenate/test_concatenate.py | 2 +- lib/iris/tests/integration/format_interop/__init__.py | 3 ++- lib/iris/tests/integration/format_interop/test_name_grib.py | 3 ++- lib/iris/tests/integration/format_interop/test_pp_grib.py | 3 ++- lib/iris/tests/integration/plot/__init__.py | 3 ++- lib/iris/tests/integration/plot/test_colorbar.py | 3 ++- lib/iris/tests/integration/test_FieldsFileVariant.py | 2 +- lib/iris/tests/integration/test_aggregated_cube.py | 1 + lib/iris/tests/integration/test_ff.py | 1 + lib/iris/tests/integration/test_grib2.py | 1 + lib/iris/tests/integration/test_netcdf.py | 1 + lib/iris/tests/integration/test_pickle.py | 1 + lib/iris/tests/integration/test_pp.py | 3 ++- .../tests/integration/test_pp_constrained_load_cubes.py | 3 ++- lib/iris/tests/integration/test_regridding.py | 1 + lib/iris/tests/pp.py | 3 ++- lib/iris/tests/runner/__init__.py | 3 ++- lib/iris/tests/runner/__main__.py | 3 ++- lib/iris/tests/runner/_runner.py | 1 + lib/iris/tests/stock.py | 2 +- lib/iris/tests/system_test.py | 3 ++- lib/iris/tests/test_abf.py | 3 ++- lib/iris/tests/test_aggregate_by.py | 1 + lib/iris/tests/test_analysis.py | 2 +- lib/iris/tests/test_analysis_calculus.py | 3 ++- lib/iris/tests/test_basic_maths.py | 1 + lib/iris/tests/test_cartography.py | 3 ++- lib/iris/tests/test_cdm.py | 1 + lib/iris/tests/test_cell.py | 1 + lib/iris/tests/test_cf.py | 1 + lib/iris/tests/test_coding_standards.py | 1 + lib/iris/tests/test_concatenate.py | 3 ++- lib/iris/tests/test_constraints.py | 2 +- lib/iris/tests/test_coord_api.py | 2 +- lib/iris/tests/test_coord_categorisation.py | 3 ++- lib/iris/tests/test_coordsystem.py | 1 + lib/iris/tests/test_cube.py | 3 ++- lib/iris/tests/test_cube_to_pp.py | 2 +- lib/iris/tests/test_ff.py | 2 +- lib/iris/tests/test_file_load.py | 3 ++- lib/iris/tests/test_file_save.py | 1 + lib/iris/tests/test_grib_load.py | 1 + lib/iris/tests/test_grib_phenomenon_translations.py | 3 ++- lib/iris/tests/test_grib_save.py | 3 ++- lib/iris/tests/test_grib_save_rules.py | 3 ++- lib/iris/tests/test_hybrid.py | 3 ++- lib/iris/tests/test_interpolation.py | 1 + lib/iris/tests/test_intersect.py | 3 ++- lib/iris/tests/test_io_init.py | 3 ++- lib/iris/tests/test_iterate.py | 2 +- lib/iris/tests/test_load.py | 3 ++- lib/iris/tests/test_mapping.py | 2 +- lib/iris/tests/test_merge.py | 2 +- lib/iris/tests/test_name.py | 3 ++- lib/iris/tests/test_netcdf.py | 1 + lib/iris/tests/test_nimrod.py | 3 ++- lib/iris/tests/test_pandas.py | 3 ++- lib/iris/tests/test_peak.py | 1 + lib/iris/tests/test_pickling.py | 2 +- lib/iris/tests/test_plot.py | 2 +- lib/iris/tests/test_pp_cf.py | 3 ++- lib/iris/tests/test_pp_module.py | 2 +- lib/iris/tests/test_pp_stash.py | 3 ++- lib/iris/tests/test_pp_to_cube.py | 2 +- lib/iris/tests/test_quickplot.py | 3 ++- lib/iris/tests/test_regrid.py | 3 ++- lib/iris/tests/test_rules.py | 2 +- lib/iris/tests/test_std_names.py | 3 ++- lib/iris/tests/test_trajectory.py | 2 +- lib/iris/tests/test_unit.py | 3 ++- lib/iris/tests/test_uri_callback.py | 3 ++- lib/iris/tests/test_util.py | 2 +- lib/iris/tests/test_verbose_logging.py | 3 ++- lib/iris/tests/unit/__init__.py | 3 ++- lib/iris/tests/unit/analysis/__init__.py | 3 ++- lib/iris/tests/unit/analysis/area_weighted/__init__.py | 3 ++- .../analysis/area_weighted/test_AreaWeightedRegridder.py | 1 + lib/iris/tests/unit/analysis/cartography/__init__.py | 3 ++- .../tests/unit/analysis/cartography/test__quadrant_area.py | 3 ++- .../tests/unit/analysis/cartography/test_area_weights.py | 1 + lib/iris/tests/unit/analysis/cartography/test_project.py | 1 + .../tests/unit/analysis/cartography/test_rotate_winds.py | 1 + lib/iris/tests/unit/analysis/geometry/__init__.py | 3 ++- .../analysis/geometry/test__extract_relevant_cube_slice.py | 3 ++- .../unit/analysis/geometry/test_geometry_area_weights.py | 3 ++- lib/iris/tests/unit/analysis/interpolate/__init__.py | 3 ++- lib/iris/tests/unit/analysis/interpolate/test_linear.py | 1 + lib/iris/tests/unit/analysis/interpolation/__init__.py | 3 ++- .../analysis/interpolation/test_RectilinearInterpolator.py | 1 + .../unit/analysis/interpolation/test_get_xy_dim_coords.py | 3 ++- lib/iris/tests/unit/analysis/maths/__init__.py | 2 +- lib/iris/tests/unit/analysis/maths/test_add.py | 3 ++- lib/iris/tests/unit/analysis/maths/test_divide.py | 3 ++- lib/iris/tests/unit/analysis/maths/test_multiply.py | 3 ++- lib/iris/tests/unit/analysis/maths/test_subtract.py | 3 ++- lib/iris/tests/unit/analysis/regrid/__init__.py | 1 + .../tests/unit/analysis/regrid/test_RectilinearRegridder.py | 2 +- .../scipy_interpolate/test__RegularGridInterpolator.py | 1 + lib/iris/tests/unit/analysis/test_Aggregator.py | 3 ++- lib/iris/tests/unit/analysis/test_AreaWeighted.py | 3 ++- lib/iris/tests/unit/analysis/test_COUNT.py | 1 + lib/iris/tests/unit/analysis/test_Linear.py | 1 + lib/iris/tests/unit/analysis/test_MEAN.py | 1 + lib/iris/tests/unit/analysis/test_Nearest.py | 1 + lib/iris/tests/unit/analysis/test_PERCENTILE.py | 2 +- lib/iris/tests/unit/analysis/test_PROPORTION.py | 1 + lib/iris/tests/unit/analysis/test_PercentileAggregator.py | 2 +- lib/iris/tests/unit/analysis/test_RMS.py | 1 + lib/iris/tests/unit/analysis/test_STD_DEV.py | 1 + lib/iris/tests/unit/analysis/test_VARIANCE.py | 1 + lib/iris/tests/unit/analysis/test_WPERCENTILE.py | 2 +- .../unit/analysis/test_WeightedPercentileAggregator.py | 1 + lib/iris/tests/unit/aux_factory/__init__.py | 3 ++- lib/iris/tests/unit/aux_factory/test_AuxCoordFactory.py | 1 + .../tests/unit/aux_factory/test_HybridPressureFactory.py | 3 ++- lib/iris/tests/unit/aux_factory/test_OceanSFactory.py | 3 ++- lib/iris/tests/unit/aux_factory/test_OceanSg1Factory.py | 3 ++- lib/iris/tests/unit/aux_factory/test_OceanSg2Factory.py | 3 ++- lib/iris/tests/unit/aux_factory/test_OceanSigmaFactory.py | 3 ++- lib/iris/tests/unit/aux_factory/test_OceanSigmaZFactory.py | 3 ++- lib/iris/tests/unit/concatenate/__init__.py | 3 ++- lib/iris/tests/unit/concatenate/test__CubeSignature.py | 3 ++- lib/iris/tests/unit/concatenate/test_concatenate.py | 2 +- lib/iris/tests/unit/coord_categorisation/__init__.py | 3 ++- .../unit/coord_categorisation/test_add_categorised_coord.py | 2 +- lib/iris/tests/unit/coord_systems/__init__.py | 3 ++- lib/iris/tests/unit/coord_systems/test_Orthographic.py | 3 ++- lib/iris/tests/unit/coord_systems/test_RotatedPole.py | 1 + .../tests/unit/coord_systems/test_VerticalPerspective.py | 3 ++- lib/iris/tests/unit/coords/__init__.py | 3 ++- lib/iris/tests/unit/coords/test_Cell.py | 3 ++- lib/iris/tests/unit/coords/test_Coord.py | 1 + lib/iris/tests/unit/cube/__init__.py | 3 ++- lib/iris/tests/unit/cube/test_Cube.py | 2 +- lib/iris/tests/unit/cube/test_CubeList.py | 2 +- lib/iris/tests/unit/experimental/__init__.py | 3 ++- lib/iris/tests/unit/experimental/equalise_cubes/__init__.py | 3 ++- .../experimental/equalise_cubes/test_equalise_attributes.py | 2 +- lib/iris/tests/unit/experimental/fieldsfile/__init__.py | 3 ++- .../unit/experimental/fieldsfile/test__convert_collation.py | 3 ++- lib/iris/tests/unit/experimental/raster/__init__.py | 3 ++- .../tests/unit/experimental/raster/test_export_geotiff.py | 1 + lib/iris/tests/unit/experimental/regrid/__init__.py | 3 ++- .../unit/experimental/regrid/test_CurviliearRegridder.py | 1 + lib/iris/tests/unit/experimental/regrid/test_PointInCell.py | 1 + .../test_regrid_area_weighted_rectilinear_src_and_grid.py | 3 ++- .../test_regrid_weighted_curvilinear_to_rectilinear.py | 2 +- lib/iris/tests/unit/experimental/um/__init__.py | 3 ++- lib/iris/tests/unit/experimental/um/test_Field.py | 2 +- lib/iris/tests/unit/experimental/um/test_Field2.py | 3 ++- lib/iris/tests/unit/experimental/um/test_Field3.py | 3 ++- .../tests/unit/experimental/um/test_FieldsFileVariant.py | 1 + .../tests/unit/experimental/um/test_FixedLengthHeader.py | 2 +- lib/iris/tests/unit/fileformats/__init__.py | 3 ++- lib/iris/tests/unit/fileformats/abf/__init__.py | 3 ++- lib/iris/tests/unit/fileformats/abf/test_ABFField.py | 3 ++- lib/iris/tests/unit/fileformats/cf/__init__.py | 3 ++- lib/iris/tests/unit/fileformats/cf/test_CFReader.py | 2 +- lib/iris/tests/unit/fileformats/ff/__init__.py | 3 ++- lib/iris/tests/unit/fileformats/ff/test_ArakawaC.py | 3 ++- lib/iris/tests/unit/fileformats/ff/test_ENDGame.py | 3 ++- lib/iris/tests/unit/fileformats/ff/test_FF2PP.py | 2 +- lib/iris/tests/unit/fileformats/ff/test_FFHeader.py | 3 ++- lib/iris/tests/unit/fileformats/ff/test_Grid.py | 3 ++- lib/iris/tests/unit/fileformats/ff/test_NewDynamics.py | 3 ++- lib/iris/tests/unit/fileformats/grib/__init__.py | 1 + .../tests/unit/fileformats/grib/load_convert/__init__.py | 3 ++- .../fileformats/grib/load_convert/test__hindcast_fix.py | 3 ++- .../fileformats/grib/load_convert/test_bitmap_section.py | 3 ++- .../unit/fileformats/grib/load_convert/test_convert.py | 3 ++- .../unit/fileformats/grib/load_convert/test_data_cutoff.py | 3 ++- .../unit/fileformats/grib/load_convert/test_ellipsoid.py | 3 ++- .../grib/load_convert/test_ellipsoid_geometry.py | 3 ++- .../grib/load_convert/test_fixup_float32_from_int32.py | 3 ++- .../grib/load_convert/test_fixup_int32_from_uint32.py | 3 ++- .../grib/load_convert/test_forecast_period_coord.py | 3 ++- .../grib/load_convert/test_generating_process.py | 3 ++- .../fileformats/grib/load_convert/test_grib2_convert.py | 3 ++- .../load_convert/test_grid_definition_template_0_and_1.py | 1 + .../grib/load_convert/test_grid_definition_template_12.py | 3 ++- .../grib/load_convert/test_grid_definition_template_30.py | 1 + .../grib/load_convert/test_grid_definition_template_40.py | 1 + .../load_convert/test_grid_definition_template_4_and_5.py | 3 ++- .../grib/load_convert/test_grid_definition_template_5.py | 3 ++- .../grib/load_convert/test_grid_definition_template_90.py | 2 +- .../fileformats/grib/load_convert/test_other_time_coord.py | 3 ++- .../grib/load_convert/test_product_definition_template_0.py | 3 ++- .../grib/load_convert/test_product_definition_template_1.py | 3 ++- .../load_convert/test_product_definition_template_31.py | 2 +- .../grib/load_convert/test_product_definition_template_8.py | 3 ++- .../grib/load_convert/test_product_definition_template_9.py | 3 ++- .../fileformats/grib/load_convert/test_projection_centre.py | 1 + .../grib/load_convert/test_reference_time_coord.py | 3 ++- .../fileformats/grib/load_convert/test_resolution_flags.py | 3 ++- .../fileformats/grib/load_convert/test_scanning_mode.py | 3 ++- .../grib/load_convert/test_statistical_cell_method.py | 3 ++- .../load_convert/test_statistical_forecast_period_coord.py | 3 ++- .../fileformats/grib/load_convert/test_time_range_unit.py | 3 ++- .../grib/load_convert/test_translate_phenomenon.py | 3 ++- .../unit/fileformats/grib/load_convert/test_unscale.py | 3 ++- .../grib/load_convert/test_validity_time_coord.py | 3 ++- .../fileformats/grib/load_convert/test_vertical_coords.py | 3 ++- lib/iris/tests/unit/fileformats/grib/load_rules/__init__.py | 3 ++- .../tests/unit/fileformats/grib/load_rules/test_convert.py | 1 + lib/iris/tests/unit/fileformats/grib/message/__init__.py | 3 ++- .../tests/unit/fileformats/grib/message/test__DataProxy.py | 1 + .../unit/fileformats/grib/message/test__GribMessage.py | 1 + .../unit/fileformats/grib/message/test__MessageLocation.py | 3 ++- .../unit/fileformats/grib/message/test__RawGribMessage.py | 2 +- .../tests/unit/fileformats/grib/message/test__Section.py | 3 ++- lib/iris/tests/unit/fileformats/grib/save_rules/__init__.py | 3 ++- .../grib/save_rules/test__missing_forecast_period.py | 3 ++- .../grib/save_rules/test__non_missing_forecast_period.py | 3 ++- .../unit/fileformats/grib/save_rules/test_data_section.py | 3 ++- .../grib/save_rules/test_fixup_float32_as_int32.py | 3 ++- .../grib/save_rules/test_fixup_int32_as_uint32.py | 3 ++- .../grib/save_rules/test_grid_definition_section.py | 3 ++- .../grib/save_rules/test_grid_definition_template_0.py | 3 ++- .../grib/save_rules/test_grid_definition_template_1.py | 3 ++- .../grib/save_rules/test_grid_definition_template_12.py | 1 + .../grib/save_rules/test_grid_definition_template_5.py | 3 ++- .../unit/fileformats/grib/save_rules/test_identification.py | 1 + .../grib/save_rules/test_product_definition_template_8.py | 3 ++- .../unit/fileformats/grib/save_rules/test_reference_time.py | 3 ++- .../fileformats/grib/save_rules/test_set_fixed_surfaces.py | 1 + .../fileformats/grib/save_rules/test_set_time_increment.py | 3 ++- .../unit/fileformats/grib/save_rules/test_set_time_range.py | 3 ++- lib/iris/tests/unit/fileformats/grib/test_GribWrapper.py | 3 ++- lib/iris/tests/unit/fileformats/grib/test_as_messages.py | 1 + lib/iris/tests/unit/fileformats/grib/test_as_pairs.py | 1 + lib/iris/tests/unit/fileformats/grib/test_load_cubes.py | 1 + lib/iris/tests/unit/fileformats/grib/test_save_messages.py | 1 + lib/iris/tests/unit/fileformats/name_loaders/__init__.py | 3 ++- .../fileformats/name_loaders/test__build_cell_methods.py | 3 ++- .../fileformats/name_loaders/test__cf_height_from_name.py | 3 ++- .../unit/fileformats/name_loaders/test_generate_cubes.py | 2 +- lib/iris/tests/unit/fileformats/netcdf/__init__.py | 3 ++- lib/iris/tests/unit/fileformats/netcdf/test_Saver.py | 2 +- .../tests/unit/fileformats/netcdf/test__load_aux_factory.py | 1 + lib/iris/tests/unit/fileformats/netcdf/test__load_cube.py | 2 +- lib/iris/tests/unit/fileformats/netcdf/test_save.py | 1 + .../tests/unit/fileformats/nimrod_load_rules/__init__.py | 3 ++- .../nimrod_load_rules/test_tm_meridian_scaling.py | 3 ++- .../fileformats/nimrod_load_rules/test_vertical_coord.py | 3 ++- lib/iris/tests/unit/fileformats/pp/__init__.py | 3 ++- lib/iris/tests/unit/fileformats/pp/test_PPDataProxy.py | 3 ++- lib/iris/tests/unit/fileformats/pp/test_PPField.py | 1 + lib/iris/tests/unit/fileformats/pp/test__LBProc.py | 2 +- .../tests/unit/fileformats/pp/test__convert_constraints.py | 3 ++- .../tests/unit/fileformats/pp/test__create_field_data.py | 1 + .../unit/fileformats/pp/test__data_bytes_to_shaped_array.py | 3 ++- lib/iris/tests/unit/fileformats/pp/test__field_gen.py | 3 ++- lib/iris/tests/unit/fileformats/pp/test__interpret_field.py | 3 ++- lib/iris/tests/unit/fileformats/pp/test_as_fields.py | 1 + lib/iris/tests/unit/fileformats/pp/test_as_pairs.py | 1 + lib/iris/tests/unit/fileformats/pp/test_load.py | 3 ++- lib/iris/tests/unit/fileformats/pp/test_save.py | 3 ++- lib/iris/tests/unit/fileformats/pp/test_save_fields.py | 1 + lib/iris/tests/unit/fileformats/pp_rules/__init__.py | 3 ++- .../unit/fileformats/pp_rules/test__all_other_rules.py | 1 + .../pp_rules/test__collapse_degenerate_points_and_bounds.py | 3 ++- .../pp_rules/test__convert_scalar_pseudo_level_coords.py | 3 ++- .../pp_rules/test__convert_scalar_realization_coords.py | 3 ++- .../pp_rules/test__convert_scalar_time_coords.py | 1 + .../pp_rules/test__convert_scalar_vertical_coords.py | 3 ++- .../unit/fileformats/pp_rules/test__convert_time_coords.py | 1 + .../fileformats/pp_rules/test__convert_vertical_coords.py | 2 +- .../tests/unit/fileformats/pp_rules/test__dim_or_aux.py | 2 +- .../unit/fileformats/pp_rules/test__model_level_number.py | 2 +- .../fileformats/pp_rules/test__reduced_points_and_bounds.py | 3 ++- .../unit/fileformats/pp_rules/test__reshape_vector_args.py | 2 +- lib/iris/tests/unit/fileformats/pp_rules/test_convert.py | 2 +- lib/iris/tests/unit/fileformats/pyke_rules/__init__.py | 3 ++- .../unit/fileformats/pyke_rules/compiled_krb/__init__.py | 3 ++- .../pyke_rules/compiled_krb/fc_rules_cf_fc/__init__.py | 3 ++- .../compiled_krb/fc_rules_cf_fc/test__parse_cell_methods.py | 1 + .../fc_rules_cf_fc/test_build_auxiliary_coordinate.py | 1 + .../compiled_krb/fc_rules_cf_fc/test_build_cube_metadata.py | 3 ++- .../fc_rules_cf_fc/test_build_dimension_coordinate.py | 1 + .../compiled_krb/fc_rules_cf_fc/test_get_attr_units.py | 1 + .../compiled_krb/fc_rules_cf_fc/test_reorder_bounds_data.py | 1 + lib/iris/tests/unit/fileformats/rules/__init__.py | 3 ++- lib/iris/tests/unit/fileformats/rules/test__make_cube.py | 3 ++- .../fileformats/structured_array_identification/__init__.py | 3 ++- .../structured_array_identification/test_ArrayStructure.py | 2 +- .../structured_array_identification/test_GroupStructure.py | 2 +- lib/iris/tests/unit/fileformats/um/__init__.py | 3 ++- .../fileformats/um/fast_load_structured_fields/__init__.py | 3 ++- .../um/fast_load_structured_fields/test_FieldCollation.py | 1 + .../test_group_structured_fields.py | 2 +- .../fileformats/um/optimal_array_structuring/__init__.py | 3 ++- .../test_optimal_array_structure.py | 1 + lib/iris/tests/unit/io/__init__.py | 3 ++- lib/iris/tests/unit/io/test_run_callback.py | 3 ++- lib/iris/tests/unit/merge/__init__.py | 3 ++- lib/iris/tests/unit/merge/test_ProtoCube.py | 3 ++- lib/iris/tests/unit/merge/test__CubeSignature.py | 3 ++- lib/iris/tests/unit/plot/__init__.py | 2 +- lib/iris/tests/unit/plot/test_contour.py | 3 ++- lib/iris/tests/unit/plot/test_contourf.py | 3 ++- lib/iris/tests/unit/plot/test_outline.py | 3 ++- lib/iris/tests/unit/plot/test_pcolor.py | 3 ++- lib/iris/tests/unit/plot/test_pcolormesh.py | 3 ++- lib/iris/tests/unit/plot/test_plot.py | 3 ++- lib/iris/tests/unit/plot/test_points.py | 3 ++- lib/iris/tests/unit/plot/test_scatter.py | 3 ++- lib/iris/tests/unit/quickplot/__init__.py | 3 ++- lib/iris/tests/unit/quickplot/test_contour.py | 3 ++- lib/iris/tests/unit/quickplot/test_contourf.py | 3 ++- lib/iris/tests/unit/quickplot/test_outline.py | 3 ++- lib/iris/tests/unit/quickplot/test_pcolor.py | 3 ++- lib/iris/tests/unit/quickplot/test_pcolormesh.py | 3 ++- lib/iris/tests/unit/quickplot/test_plot.py | 3 ++- lib/iris/tests/unit/quickplot/test_points.py | 3 ++- lib/iris/tests/unit/quickplot/test_scatter.py | 3 ++- lib/iris/tests/unit/test_Future.py | 1 + lib/iris/tests/unit/tests/__init__.py | 3 ++- lib/iris/tests/unit/tests/test_IrisTest.py | 3 ++- lib/iris/tests/unit/time/test_PartialDateTime.py | 2 +- lib/iris/tests/unit/unit/__init__.py | 3 ++- lib/iris/tests/unit/unit/test_Unit.py | 3 ++- lib/iris/tests/unit/unit/test_suppress_unit_warnings.py | 3 ++- lib/iris/tests/unit/util/__init__.py | 3 ++- lib/iris/tests/unit/util/test_array_equal.py | 3 ++- lib/iris/tests/unit/util/test_broadcast_to_shape.py | 2 +- lib/iris/tests/unit/util/test_column_slices_generator.py | 1 + .../tests/unit/util/test_demote_dim_coord_to_aux_coord.py | 1 + lib/iris/tests/unit/util/test_describe_diff.py | 1 + lib/iris/tests/unit/util/test_file_is_newer_than.py | 3 ++- lib/iris/tests/unit/util/test_new_axis.py | 2 +- .../tests/unit/util/test_promote_aux_coord_to_dim_coord.py | 1 + lib/iris/tests/unit/util/test_rolling_window.py | 3 ++- lib/iris/tests/unit/util/test_squeeze.py | 1 + lib/iris/tests/unit/util/test_unify_time_units.py | 3 ++- lib/iris/time.py | 3 ++- lib/iris/unit.py | 2 +- lib/iris/util.py | 2 +- tools/gen_helpers.py | 3 ++- tools/gen_stash_refs.py | 3 ++- tools/gen_translations.py | 2 ++ tools/generate_std_names.py | 6 ++++-- tools/translator/__init__.py | 2 +- 472 files changed, 740 insertions(+), 358 deletions(-) diff --git a/docs/iris/example_tests/__init__.py b/docs/iris/example_tests/__init__.py index bd1f1c985c..174361337f 100644 --- a/docs/iris/example_tests/__init__.py +++ b/docs/iris/example_tests/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,3 +16,4 @@ # along with Iris. If not, see . 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 3d65a7cafb..34e227fd65 100644 --- a/docs/iris/example_tests/extest_util.py +++ b/docs/iris/example_tests/extest_util.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -22,6 +22,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import contextlib import os.path diff --git a/docs/iris/example_tests/test_COP_1d_plot.py b/docs/iris/example_tests/test_COP_1d_plot.py index 5c7f9fdba9..f9ab9b76e3 100644 --- a/docs/iris/example_tests/test_COP_1d_plot.py +++ b/docs/iris/example_tests/test_COP_1d_plot.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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. 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 index 8d3e61b2b1..6d737ac876 100644 --- a/docs/iris/example_tests/test_COP_maps.py +++ b/docs/iris/example_tests/test_COP_maps.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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. 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 index 65d8ceee80..0d70cb4e42 100644 --- a/docs/iris/example_tests/test_SOI_filtering.py +++ b/docs/iris/example_tests/test_SOI_filtering.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2012 - 2014, Met Office +# (C) British Crown Copyright 2012 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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. import iris.tests as tests diff --git a/docs/iris/example_tests/test_TEC.py b/docs/iris/example_tests/test_TEC.py index a8d2c678e1..d1dfae84cc 100644 --- a/docs/iris/example_tests/test_TEC.py +++ b/docs/iris/example_tests/test_TEC.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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. 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 index 185c3879fd..1f651d5dee 100644 --- a/docs/iris/example_tests/test_anomaly_log_colouring.py +++ b/docs/iris/example_tests/test_anomaly_log_colouring.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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/docs/iris/example_tests/test_atlantic_profiles.py b/docs/iris/example_tests/test_atlantic_profiles.py index ddcc00f0a1..6798b695f7 100644 --- a/docs/iris/example_tests/test_atlantic_profiles.py +++ b/docs/iris/example_tests/test_atlantic_profiles.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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/docs/iris/example_tests/test_cross_section.py b/docs/iris/example_tests/test_cross_section.py index 6070f13e9a..d36a96e7ab 100644 --- a/docs/iris/example_tests/test_cross_section.py +++ b/docs/iris/example_tests/test_cross_section.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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. 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 index e9e321a5fb..f464c13dbf 100644 --- a/docs/iris/example_tests/test_custom_aggregation.py +++ b/docs/iris/example_tests/test_custom_aggregation.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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/docs/iris/example_tests/test_custom_file_loading.py b/docs/iris/example_tests/test_custom_file_loading.py index 6f6fac050c..dd2789dffe 100644 --- a/docs/iris/example_tests/test_custom_file_loading.py +++ b/docs/iris/example_tests/test_custom_file_loading.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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. 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 index 860e61a928..08cba4cc95 100644 --- a/docs/iris/example_tests/test_deriving_phenomena.py +++ b/docs/iris/example_tests/test_deriving_phenomena.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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. 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 index cb5b780b5b..d2b097915e 100644 --- a/docs/iris/example_tests/test_global_map.py +++ b/docs/iris/example_tests/test_global_map.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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. import iris.tests as tests diff --git a/docs/iris/example_tests/test_hovmoller.py b/docs/iris/example_tests/test_hovmoller.py index 4f88766a90..3e02cd118b 100644 --- a/docs/iris/example_tests/test_hovmoller.py +++ b/docs/iris/example_tests/test_hovmoller.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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. import iris.tests as tests diff --git a/docs/iris/example_tests/test_lagged_ensemble.py b/docs/iris/example_tests/test_lagged_ensemble.py index 09facfec7b..b26623907f 100644 --- a/docs/iris/example_tests/test_lagged_ensemble.py +++ b/docs/iris/example_tests/test_lagged_ensemble.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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. 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 index b96830f0cc..bf2d8a412c 100644 --- a/docs/iris/example_tests/test_lineplot_with_legend.py +++ b/docs/iris/example_tests/test_lineplot_with_legend.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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. 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 index e80b69ea1c..f3c06d7c85 100644 --- a/docs/iris/example_tests/test_orca_projection.py +++ b/docs/iris/example_tests/test_orca_projection.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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/docs/iris/example_tests/test_polar_stereo.py b/docs/iris/example_tests/test_polar_stereo.py index 6d2bd5be37..3d40561e8e 100644 --- a/docs/iris/example_tests/test_polar_stereo.py +++ b/docs/iris/example_tests/test_polar_stereo.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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/docs/iris/example_tests/test_polynomial_fit.py b/docs/iris/example_tests/test_polynomial_fit.py index a8c00fb68d..6f38391236 100644 --- a/docs/iris/example_tests/test_polynomial_fit.py +++ b/docs/iris/example_tests/test_polynomial_fit.py @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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/docs/iris/example_tests/test_projections_and_annotations.py b/docs/iris/example_tests/test_projections_and_annotations.py index 5c2ce7a850..c333ee0d5f 100644 --- a/docs/iris/example_tests/test_projections_and_annotations.py +++ b/docs/iris/example_tests/test_projections_and_annotations.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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/docs/iris/example_tests/test_rotated_pole_mapping.py b/docs/iris/example_tests/test_rotated_pole_mapping.py index 7995a69092..1843dbc503 100644 --- a/docs/iris/example_tests/test_rotated_pole_mapping.py +++ b/docs/iris/example_tests/test_rotated_pole_mapping.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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. import iris.tests as tests diff --git a/docs/iris/src/conf.py b/docs/iris/src/conf.py index 461cde06e4..790b42162f 100644 --- a/docs/iris/src/conf.py +++ b/docs/iris/src/conf.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa # -*- coding: utf-8 -*- # @@ -97,7 +98,7 @@ project = u'Iris' # define the copyright information for latex builds. Note, for html builds, # the copyright exists directly inside "_templates/layout.html" -copyright = u'British Crown Copyright 2010 - 2014, Met Office' +copyright = u'British Crown Copyright 2010 - 2015, Met Office' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/iris/src/developers_guide/gitwash_dumper.py b/docs/iris/src/developers_guide/gitwash_dumper.py index ef86aaea8b..c69fbf649b 100644 --- a/docs/iris/src/developers_guide/gitwash_dumper.py +++ b/docs/iris/src/developers_guide/gitwash_dumper.py @@ -2,6 +2,7 @@ ''' 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 from os.path import join as pjoin diff --git a/docs/iris/src/sphinxext/auto_label_figures.py b/docs/iris/src/sphinxext/auto_label_figures.py index 481edb6018..00f3aa96dc 100644 --- a/docs/iris/src/sphinxext/auto_label_figures.py +++ b/docs/iris/src/sphinxext/auto_label_figures.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) +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 index 9f3be6b74c..af8309b2d3 100644 --- a/docs/iris/src/sphinxext/custom_class_autodoc.py +++ b/docs/iris/src/sphinxext/custom_class_autodoc.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa from sphinx.ext import autodoc from sphinx.ext.autodoc import * diff --git a/docs/iris/src/sphinxext/custom_data_autodoc.py b/docs/iris/src/sphinxext/custom_data_autodoc.py index 3d558e2516..29a4fda94c 100644 --- a/docs/iris/src/sphinxext/custom_data_autodoc.py +++ b/docs/iris/src/sphinxext/custom_data_autodoc.py @@ -16,6 +16,7 @@ # along with Iris. If not, see . 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 try: diff --git a/docs/iris/src/sphinxext/gen_example_directory.py b/docs/iris/src/sphinxext/gen_example_directory.py index ced8fc8409..584f9d1f00 100644 --- a/docs/iris/src/sphinxext/gen_example_directory.py +++ b/docs/iris/src/sphinxext/gen_example_directory.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ ''' from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import os import re diff --git a/docs/iris/src/sphinxext/gen_gallery.py b/docs/iris/src/sphinxext/gen_gallery.py index 27089b083a..3c4d94c607 100644 --- a/docs/iris/src/sphinxext/gen_gallery.py +++ b/docs/iris/src/sphinxext/gen_gallery.py @@ -7,6 +7,7 @@ ''' from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import os import glob diff --git a/docs/iris/src/sphinxext/generate_package_rst.py b/docs/iris/src/sphinxext/generate_package_rst.py index 64363fb898..396b7c51fb 100644 --- a/docs/iris/src/sphinxext/generate_package_rst.py +++ b/docs/iris/src/sphinxext/generate_package_rst.py @@ -16,7 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) -from six.moves import filter +from six.moves import (filter, input, map, range, zip) # noqa import os import sys 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 55ffa0c628..75462101a0 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,6 @@ 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 c9c51e436e..8cb3f45643 100644 --- a/docs/iris/src/userguide/plotting_examples/1d_simple.py +++ b/docs/iris/src/userguide/plotting_examples/1d_simple.py @@ -1,5 +1,6 @@ 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 84d0f43490..5b57ef5b85 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,6 @@ 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 6fb4726d9b..2d61e276ab 100644 --- a/docs/iris/src/userguide/plotting_examples/brewer.py +++ b/docs/iris/src/userguide/plotting_examples/brewer.py @@ -1,5 +1,6 @@ from __future__ import (absolute_import, division, print_function) +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 index d5979b1d2d..a6273a274c 100644 --- a/docs/iris/src/userguide/plotting_examples/cube_blockplot.py +++ b/docs/iris/src/userguide/plotting_examples/cube_blockplot.py @@ -1,5 +1,6 @@ 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 1c337e844a..9ba68fc47a 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,6 @@ 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 d0ef4248f2..aacf129c30 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,6 @@ from __future__ import (absolute_import, division, print_function) +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 index 4c7633b998..efa58040a4 100644 --- a/docs/iris/src/userguide/plotting_examples/cube_contour.py +++ b/docs/iris/src/userguide/plotting_examples/cube_contour.py @@ -1,5 +1,6 @@ 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 96f04fe3d7..21ebb1a214 100644 --- a/docs/iris/src/userguide/plotting_examples/cube_contourf.py +++ b/docs/iris/src/userguide/plotting_examples/cube_contourf.py @@ -1,5 +1,6 @@ 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 e93af59b1a..fb26c1393b 100644 --- a/docs/iris/src/userguide/regridding_plots/interpolate_column.py +++ b/docs/iris/src/userguide/regridding_plots/interpolate_column.py @@ -1,5 +1,6 @@ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import iris import iris.quickplot as qplt 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 f79a7d837d..c392de7a52 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,6 @@ from __future__ import (absolute_import, division, print_function) +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_global_area_weighted.py b/docs/iris/src/userguide/regridding_plots/regridded_to_global_area_weighted.py index 944cf8022e..067a4ee2d6 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,6 +1,6 @@ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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 index 39610b8f2e..f2c2b271df 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,6 @@ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import iris import iris.analysis diff --git a/docs/iris/src/userguide/regridding_plots/regridding_plot.py b/docs/iris/src/userguide/regridding_plots/regridding_plot.py index 41f1c272f1..2419d47727 100644 --- a/docs/iris/src/userguide/regridding_plots/regridding_plot.py +++ b/docs/iris/src/userguide/regridding_plots/regridding_plot.py @@ -1,5 +1,6 @@ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import iris import iris.plot as iplt diff --git a/docs/iris/src/whatsnew/aggregate_directory.py b/docs/iris/src/whatsnew/aggregate_directory.py index fe80c5f9e9..d1fd39db5a 100644 --- a/docs/iris/src/whatsnew/aggregate_directory.py +++ b/docs/iris/src/whatsnew/aggregate_directory.py @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import datetime import os import re diff --git a/lib/iris/__init__.py b/lib/iris/__init__.py index b9f3c0452c..55e44ae7da 100644 --- a/lib/iris/__init__.py +++ b/lib/iris/__init__.py @@ -96,6 +96,7 @@ def callback(cube, field, filename): """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import contextlib import itertools diff --git a/lib/iris/_concatenate.py b/lib/iris/_concatenate.py index fb0a8137b8..714c758861 100644 --- a/lib/iris/_concatenate.py +++ b/lib/iris/_concatenate.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +from six.moves import (filter, input, map, range, zip) # noqa from collections import defaultdict, namedtuple diff --git a/lib/iris/_constraints.py b/lib/iris/_constraints.py index 3d9c1f6881..ff61cb037b 100644 --- a/lib/iris/_constraints.py +++ b/lib/iris/_constraints.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +from six.moves import (filter, input, map, range, zip) # noqa import collections import operator diff --git a/lib/iris/_cube_coord_common.py b/lib/iris/_cube_coord_common.py index 4f23e2c27f..49748a38b1 100644 --- a/lib/iris/_cube_coord_common.py +++ b/lib/iris/_cube_coord_common.py @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa # TODO: Is this a mixin or a base class? diff --git a/lib/iris/_merge.py b/lib/iris/_merge.py index fd3931bb61..a4e21c623f 100644 --- a/lib/iris/_merge.py +++ b/lib/iris/_merge.py @@ -23,7 +23,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import map, range, zip +from six.moves import (filter, input, map, range, zip) # noqa from collections import namedtuple, OrderedDict from copy import deepcopy diff --git a/lib/iris/analysis/__init__.py b/lib/iris/analysis/__init__.py index a418da5f5a..2f8e15a334 100644 --- a/lib/iris/analysis/__init__.py +++ b/lib/iris/analysis/__init__.py @@ -47,7 +47,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import filter, range, zip +from six.moves import (filter, input, map, range, zip) # noqa import collections diff --git a/lib/iris/analysis/_area_weighted.py b/lib/iris/analysis/_area_weighted.py index b28640709b..e4215ac259 100644 --- a/lib/iris/analysis/_area_weighted.py +++ b/lib/iris/analysis/_area_weighted.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . 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 7937fd3e70..bf66d14fba 100644 --- a/lib/iris/analysis/_interpolation.py +++ b/lib/iris/analysis/_interpolation.py @@ -17,7 +17,7 @@ """A collection of helpers for interpolation.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +from six.moves import (filter, input, map, range, zip) # noqa from collections import namedtuple from itertools import product diff --git a/lib/iris/analysis/_regrid.py b/lib/iris/analysis/_regrid.py index 195aadd7ef..87c3f51d91 100644 --- a/lib/iris/analysis/_regrid.py +++ b/lib/iris/analysis/_regrid.py @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import copy import functools diff --git a/lib/iris/analysis/_scipy_interpolate.py b/lib/iris/analysis/_scipy_interpolate.py index 388726c791..c93234e5d7 100644 --- a/lib/iris/analysis/_scipy_interpolate.py +++ b/lib/iris/analysis/_scipy_interpolate.py @@ -1,5 +1,5 @@ from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +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 99931f5479..756cace36a 100644 --- a/lib/iris/analysis/calculus.py +++ b/lib/iris/analysis/calculus.py @@ -22,7 +22,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import filter, zip +from six.moves import (filter, input, map, range, zip) # noqa import re import warnings diff --git a/lib/iris/analysis/cartography.py b/lib/iris/analysis/cartography.py index 09409fc8ba..8953350d75 100644 --- a/lib/iris/analysis/cartography.py +++ b/lib/iris/analysis/cartography.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +from six.moves import (filter, input, map, range, zip) # noqa import copy import warnings diff --git a/lib/iris/analysis/geometry.py b/lib/iris/analysis/geometry.py index 277d4309f4..a415e10091 100644 --- a/lib/iris/analysis/geometry.py +++ b/lib/iris/analysis/geometry.py @@ -23,7 +23,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +from six.moves import (filter, input, map, range, zip) # noqa import warnings diff --git a/lib/iris/analysis/interpolate.py b/lib/iris/analysis/interpolate.py index dc2d458fe1..5602146477 100644 --- a/lib/iris/analysis/interpolate.py +++ b/lib/iris/analysis/interpolate.py @@ -22,7 +22,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import map, range, zip +from six.moves import (filter, input, map, range, zip) # noqa import collections import warnings diff --git a/lib/iris/analysis/maths.py b/lib/iris/analysis/maths.py index 972298ff4d..0c12d6008d 100644 --- a/lib/iris/analysis/maths.py +++ b/lib/iris/analysis/maths.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import filter +from six.moves import (filter, input, map, range, zip) # noqa import warnings import math diff --git a/lib/iris/analysis/stats.py b/lib/iris/analysis/stats.py index f3715f6e8b..a49d563fc0 100644 --- a/lib/iris/analysis/stats.py +++ b/lib/iris/analysis/stats.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ 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 7bb9e88e8a..8d5b7e830c 100644 --- a/lib/iris/analysis/trajectory.py +++ b/lib/iris/analysis/trajectory.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +from six.moves import (filter, input, map, range, zip) # noqa import math diff --git a/lib/iris/aux_factory.py b/lib/iris/aux_factory.py index c268e21752..349a433c3a 100644 --- a/lib/iris/aux_factory.py +++ b/lib/iris/aux_factory.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import map, range, zip +from six.moves import (filter, input, map, range, zip) # noqa from abc import ABCMeta, abstractmethod, abstractproperty import warnings diff --git a/lib/iris/config.py b/lib/iris/config.py index e6ce75d033..fde185c718 100644 --- a/lib/iris/config.py +++ b/lib/iris/config.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -59,6 +59,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import ConfigParser import os.path diff --git a/lib/iris/coord_categorisation.py b/lib/iris/coord_categorisation.py index 4592327aa6..b1048fc29f 100644 --- a/lib/iris/coord_categorisation.py +++ b/lib/iris/coord_categorisation.py @@ -28,7 +28,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +from six.moves import (filter, input, map, range, zip) # noqa import calendar import collections diff --git a/lib/iris/coord_systems.py b/lib/iris/coord_systems.py index 9dc8613855..1dc9a97c8e 100644 --- a/lib/iris/coord_systems.py +++ b/lib/iris/coord_systems.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa from abc import ABCMeta, abstractmethod import warnings diff --git a/lib/iris/coords.py b/lib/iris/coords.py index 11c2454605..0ae8071c42 100644 --- a/lib/iris/coords.py +++ b/lib/iris/coords.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import filter, map, range +from six.moves import (filter, input, map, range, zip) # noqa from abc import ABCMeta, abstractproperty import collections diff --git a/lib/iris/cube.py b/lib/iris/cube.py index 0ebc45d190..5bdf060863 100644 --- a/lib/iris/cube.py +++ b/lib/iris/cube.py @@ -21,7 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import filter, map, range, zip +from six.moves import (filter, input, map, range, zip) # noqa from xml.dom.minidom import Document import collections diff --git a/lib/iris/exceptions.py b/lib/iris/exceptions.py index ec8ebfa919..58e47d6fd5 100644 --- a/lib/iris/exceptions.py +++ b/lib/iris/exceptions.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import iris.coords diff --git a/lib/iris/experimental/__init__.py b/lib/iris/experimental/__init__.py index c027eaacae..eb29818f80 100644 --- a/lib/iris/experimental/__init__.py +++ b/lib/iris/experimental/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -23,3 +23,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 42344288a0..9b4c46b5f4 100644 --- a/lib/iris/experimental/animate.py +++ b/lib/iris/experimental/animate.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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 ab6718225a..dcf3fcdd22 100644 --- a/lib/iris/experimental/concatenate.py +++ b/lib/iris/experimental/concatenate.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -25,6 +25,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa def concatenate(cubes): diff --git a/lib/iris/experimental/equalise_cubes.py b/lib/iris/experimental/equalise_cubes.py index 87ebaf3b1c..bf3379db66 100644 --- a/lib/iris/experimental/equalise_cubes.py +++ b/lib/iris/experimental/equalise_cubes.py @@ -20,6 +20,7 @@ """ 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/fieldsfile.py b/lib/iris/experimental/fieldsfile.py index 8b282f8ae5..7307a7911d 100644 --- a/lib/iris/experimental/fieldsfile.py +++ b/lib/iris/experimental/fieldsfile.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import filter, range, zip +from six.moves import (filter, input, map, range, zip) # noqa from iris.coords import DimCoord from iris.cube import CubeList diff --git a/lib/iris/experimental/raster.py b/lib/iris/experimental/raster.py index 3f30fe7d96..68987347fa 100644 --- a/lib/iris/experimental/raster.py +++ b/lib/iris/experimental/raster.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -26,6 +26,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import numpy as np from osgeo import gdal, osr diff --git a/lib/iris/experimental/regrid.py b/lib/iris/experimental/regrid.py index 083fe16dcb..2d665787a0 100644 --- a/lib/iris/experimental/regrid.py +++ b/lib/iris/experimental/regrid.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +from six.moves import (filter, input, map, range, zip) # noqa from collections import namedtuple import copy diff --git a/lib/iris/experimental/regrid_conservative.py b/lib/iris/experimental/regrid_conservative.py index 8df26e05c8..3aa41b04f9 100644 --- a/lib/iris/experimental/regrid_conservative.py +++ b/lib/iris/experimental/regrid_conservative.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +from six.moves import (filter, input, map, range, zip) # noqa # Import ESMF via iris.proxy, just so we can build the docs with no ESMF. import iris.proxy diff --git a/lib/iris/experimental/ugrid.py b/lib/iris/experimental/ugrid.py index d8ccf3ceee..87340b741b 100644 --- a/lib/iris/experimental/ugrid.py +++ b/lib/iris/experimental/ugrid.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ 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/experimental/um.py b/lib/iris/experimental/um.py index 55573dff10..0e53b1e86a 100644 --- a/lib/iris/experimental/um.py +++ b/lib/iris/experimental/um.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +from six.moves import (filter, input, map, range, zip) # noqa from contextlib import contextmanager import os diff --git a/lib/iris/fileformats/__init__.py b/lib/iris/fileformats/__init__.py index cbb6bf8293..05925b2f78 100644 --- a/lib/iris/fileformats/__init__.py +++ b/lib/iris/fileformats/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ 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, FormatSpecification, MagicNumber, diff --git a/lib/iris/fileformats/_ff_cross_references.py b/lib/iris/fileformats/_ff_cross_references.py index 8486133199..fb0271f47f 100644 --- a/lib/iris/fileformats/_ff_cross_references.py +++ b/lib/iris/fileformats/_ff_cross_references.py @@ -23,6 +23,7 @@ """ 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/_structured_array_identification.py b/lib/iris/fileformats/_structured_array_identification.py index f3302097fe..5e0f680664 100644 --- a/lib/iris/fileformats/_structured_array_identification.py +++ b/lib/iris/fileformats/_structured_array_identification.py @@ -55,7 +55,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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 ae34dcb2f4..93701396ef 100644 --- a/lib/iris/fileformats/abf.py +++ b/lib/iris/fileformats/abf.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2012 - 2014, Met Office +# (C) British Crown Copyright 2012 - 2015, Met Office # # This file is part of Iris. # @@ -26,6 +26,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import calendar import datetime diff --git a/lib/iris/fileformats/cf.py b/lib/iris/fileformats/cf.py index 0dfb988f8c..4672d7925d 100644 --- a/lib/iris/fileformats/cf.py +++ b/lib/iris/fileformats/cf.py @@ -26,6 +26,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa from abc import ABCMeta, abstractmethod from collections import Iterable, MutableMapping diff --git a/lib/iris/fileformats/dot.py b/lib/iris/fileformats/dot.py index 9890ee874c..493943bb07 100644 --- a/lib/iris/fileformats/dot.py +++ b/lib/iris/fileformats/dot.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import os import subprocess diff --git a/lib/iris/fileformats/ff.py b/lib/iris/fileformats/ff.py index 525870339a..81210dd020 100644 --- a/lib/iris/fileformats/ff.py +++ b/lib/iris/fileformats/ff.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +from six.moves import (filter, input, map, range, zip) # noqa import os import warnings diff --git a/lib/iris/fileformats/grib/__init__.py b/lib/iris/fileformats/grib/__init__.py index c732f0f292..67dc6ebadf 100644 --- a/lib/iris/fileformats/grib/__init__.py +++ b/lib/iris/fileformats/grib/__init__.py @@ -22,6 +22,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import datetime import math #for fmod diff --git a/lib/iris/fileformats/grib/_grib_cf_map.py b/lib/iris/fileformats/grib/_grib_cf_map.py index 65af1f48ad..a4a02e8096 100644 --- a/lib/iris/fileformats/grib/_grib_cf_map.py +++ b/lib/iris/fileformats/grib/_grib_cf_map.py @@ -22,6 +22,7 @@ """ 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/grib/_load_convert.py b/lib/iris/fileformats/grib/_load_convert.py index e5cd0c5372..1923632015 100644 --- a/lib/iris/fileformats/grib/_load_convert.py +++ b/lib/iris/fileformats/grib/_load_convert.py @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa from collections import namedtuple, Iterable, OrderedDict from datetime import datetime, timedelta diff --git a/lib/iris/fileformats/grib/_message.py b/lib/iris/fileformats/grib/_message.py index a85571e026..15d24a775f 100644 --- a/lib/iris/fileformats/grib/_message.py +++ b/lib/iris/fileformats/grib/_message.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa from collections import namedtuple import re diff --git a/lib/iris/fileformats/grib/_save_rules.py b/lib/iris/fileformats/grib/_save_rules.py index 713b32c5ca..277784f07e 100644 --- a/lib/iris/fileformats/grib/_save_rules.py +++ b/lib/iris/fileformats/grib/_save_rules.py @@ -25,6 +25,7 @@ """ 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/fileformats/grib/grib_phenom_translation.py b/lib/iris/fileformats/grib/grib_phenom_translation.py index f12b0ca40d..734e445d36 100644 --- a/lib/iris/fileformats/grib/grib_phenom_translation.py +++ b/lib/iris/fileformats/grib/grib_phenom_translation.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -29,6 +29,7 @@ ''' from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import collections import warnings diff --git a/lib/iris/fileformats/grib/grib_save_rules.py b/lib/iris/fileformats/grib/grib_save_rules.py index 58bcd9ea3e..be574cacc6 100644 --- a/lib/iris/fileformats/grib/grib_save_rules.py +++ b/lib/iris/fileformats/grib/grib_save_rules.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -26,6 +26,7 @@ """ 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/fileformats/grib/load_rules.py b/lib/iris/fileformats/grib/load_rules.py index 046a3e7e23..936c30ff0f 100644 --- a/lib/iris/fileformats/grib/load_rules.py +++ b/lib/iris/fileformats/grib/load_rules.py @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa # Historically this was auto-generated from # SciTools/iris-code-generators:tools/gen_rules.py diff --git a/lib/iris/fileformats/name.py b/lib/iris/fileformats/name.py index 447d3d4be6..baf6ef0804 100644 --- a/lib/iris/fileformats/name.py +++ b/lib/iris/fileformats/name.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 iris.io diff --git a/lib/iris/fileformats/name_loaders.py b/lib/iris/fileformats/name_loaders.py index ff29e36df0..8a6cec46be 100644 --- a/lib/iris/fileformats/name_loaders.py +++ b/lib/iris/fileformats/name_loaders.py @@ -17,7 +17,7 @@ """NAME file format loading functions.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +from six.moves import (filter, input, map, range, zip) # noqa import collections import datetime diff --git a/lib/iris/fileformats/netcdf.py b/lib/iris/fileformats/netcdf.py index 65fa52e0e5..ad50791a23 100644 --- a/lib/iris/fileformats/netcdf.py +++ b/lib/iris/fileformats/netcdf.py @@ -25,7 +25,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import filter, range +from six.moves import (filter, input, map, range, zip) # noqa import collections import os diff --git a/lib/iris/fileformats/nimrod.py b/lib/iris/fileformats/nimrod.py index 4194e2b3fc..ea9a4c7637 100644 --- a/lib/iris/fileformats/nimrod.py +++ b/lib/iris/fileformats/nimrod.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Provides NIMROD file format capabilities.""" from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import glob import numpy as np diff --git a/lib/iris/fileformats/nimrod_load_rules.py b/lib/iris/fileformats/nimrod_load_rules.py index 7970b521b7..8ef49a3312 100644 --- a/lib/iris/fileformats/nimrod_load_rules.py +++ b/lib/iris/fileformats/nimrod_load_rules.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 import warnings diff --git a/lib/iris/fileformats/pp.py b/lib/iris/fileformats/pp.py index 004fea7bdc..3593916716 100644 --- a/lib/iris/fileformats/pp.py +++ b/lib/iris/fileformats/pp.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +from six.moves import (filter, input, map, range, zip) # noqa import abc import collections diff --git a/lib/iris/fileformats/pp_rules.py b/lib/iris/fileformats/pp_rules.py index 970133413a..8268f793ad 100644 --- a/lib/iris/fileformats/pp_rules.py +++ b/lib/iris/fileformats/pp_rules.py @@ -16,7 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) -from six.moves import range +from six.moves import (filter, input, map, range, zip) # noqa # Historically this was auto-generated from # SciTools/iris-code-generators:tools/gen_rules.py diff --git a/lib/iris/fileformats/rules.py b/lib/iris/fileformats/rules.py index 4e37d78609..b2fc55ade5 100644 --- a/lib/iris/fileformats/rules.py +++ b/lib/iris/fileformats/rules.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import filter +from six.moves import (filter, input, map, range, zip) # noqa import abc import collections diff --git a/lib/iris/fileformats/um/__init__.py b/lib/iris/fileformats/um/__init__.py index 734ec87b4e..cd57beb55f 100644 --- a/lib/iris/fileformats/um/__init__.py +++ b/lib/iris/fileformats/um/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,3 +20,4 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa diff --git a/lib/iris/fileformats/um/_fast_load_structured_fields.py b/lib/iris/fileformats/um/_fast_load_structured_fields.py index 4a3e25e53a..99f4c36205 100644 --- a/lib/iris/fileformats/um/_fast_load_structured_fields.py +++ b/lib/iris/fileformats/um/_fast_load_structured_fields.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Experimental code for fast loading of structured UM data.""" 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/_optimal_array_structuring.py b/lib/iris/fileformats/um/_optimal_array_structuring.py index 76571f561b..930ff74110 100644 --- a/lib/iris/fileformats/um/_optimal_array_structuring.py +++ b/lib/iris/fileformats/um/_optimal_array_structuring.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 itertools diff --git a/lib/iris/fileformats/um_cf_map.py b/lib/iris/fileformats/um_cf_map.py index d4ad2701a8..ec23a0c4d9 100644 --- a/lib/iris/fileformats/um_cf_map.py +++ b/lib/iris/fileformats/um_cf_map.py @@ -22,6 +22,7 @@ """ 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 caa666a754..54adb4aaa5 100644 --- a/lib/iris/io/__init__.py +++ b/lib/iris/io/__init__.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import map +from six.moves import (filter, input, map, range, zip) # noqa import glob import os.path diff --git a/lib/iris/io/format_picker.py b/lib/iris/io/format_picker.py index 7db3cdd490..bf7d5b7f34 100644 --- a/lib/iris/io/format_picker.py +++ b/lib/iris/io/format_picker.py @@ -51,6 +51,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import collections import functools diff --git a/lib/iris/iterate.py b/lib/iris/iterate.py index ffc0a2bebc..12239978d8 100644 --- a/lib/iris/iterate.py +++ b/lib/iris/iterate.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +from six.moves import (filter, input, map, range, zip) # noqa import collections import itertools diff --git a/lib/iris/palette.py b/lib/iris/palette.py index dafddea6f6..9c886dd2bf 100644 --- a/lib/iris/palette.py +++ b/lib/iris/palette.py @@ -21,7 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import filter +from six.moves import (filter, input, map, range, zip) # noqa from functools import wraps import os diff --git a/lib/iris/pandas.py b/lib/iris/pandas.py index da0f6945c5..b1b07560e8 100644 --- a/lib/iris/pandas.py +++ b/lib/iris/pandas.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -22,6 +22,7 @@ """ 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 b655fdc826..7945cc13e6 100644 --- a/lib/iris/plot.py +++ b/lib/iris/plot.py @@ -23,7 +23,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import map, zip +from six.moves import (filter, input, map, range, zip) # noqa import collections import datetime diff --git a/lib/iris/proxy.py b/lib/iris/proxy.py index 7fa89c7818..f55bba256e 100644 --- a/lib/iris/proxy.py +++ b/lib/iris/proxy.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -22,6 +22,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import sys diff --git a/lib/iris/quickplot.py b/lib/iris/quickplot.py index 21912b7e49..9a136ea2df 100644 --- a/lib/iris/quickplot.py +++ b/lib/iris/quickplot.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -25,6 +25,7 @@ """ 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/lib/iris/symbols.py b/lib/iris/symbols.py index d4fc8466b5..ebddfdd168 100644 --- a/lib/iris/symbols.py +++ b/lib/iris/symbols.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import itertools import math diff --git a/lib/iris/tests/__init__.py b/lib/iris/tests/__init__.py index ee97ec79bc..90c9bfae83 100644 --- a/lib/iris/tests/__init__.py +++ b/lib/iris/tests/__init__.py @@ -31,7 +31,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import map +from six.moves import (filter, input, map, range, zip) # noqa import collections import contextlib diff --git a/lib/iris/tests/analysis/__init__.py b/lib/iris/tests/analysis/__init__.py index 65ebc6f7e4..8b52364e6a 100644 --- a/lib/iris/tests/analysis/__init__.py +++ b/lib/iris/tests/analysis/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -20,3 +20,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/analysis/test_interpolate.py b/lib/iris/tests/analysis/test_interpolate.py index dd33a5dff4..6f0be96c56 100644 --- a/lib/iris/tests/analysis/test_interpolate.py +++ b/lib/iris/tests/analysis/test_interpolate.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/analysis/test_stats.py b/lib/iris/tests/analysis/test_stats.py index 992978530c..bb4dbadcf7 100644 --- a/lib/iris/tests/analysis/test_stats.py +++ b/lib/iris/tests/analysis/test_stats.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/experimental/__init__.py b/lib/iris/tests/experimental/__init__.py index 46f75bf50d..ae127f0615 100644 --- a/lib/iris/tests/experimental/__init__.py +++ b/lib/iris/tests/experimental/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,3 +20,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 e4a0793eca..f6cdfa815a 100644 --- a/lib/iris/tests/experimental/regrid/__init__.py +++ b/lib/iris/tests/experimental/regrid/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -20,3 +20,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 7e88812686..e5318a6b80 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 @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/experimental/regrid/test_regrid_conservative_via_esmpy.py b/lib/iris/tests/experimental/regrid/test_regrid_conservative_via_esmpy.py index a28b2e3f3a..2cc7aeb5eb 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/experimental/test_animate.py b/lib/iris/tests/experimental/test_animate.py index 6df5b2d8cf..95f7804af4 100644 --- a/lib/iris/tests/experimental/test_animate.py +++ b/lib/iris/tests/experimental/test_animate.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/experimental/test_fieldsfile.py b/lib/iris/tests/experimental/test_fieldsfile.py index 9acd9199b6..5059ccee07 100644 --- a/lib/iris/tests/experimental/test_fieldsfile.py +++ b/lib/iris/tests/experimental/test_fieldsfile.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/experimental/test_raster.py b/lib/iris/tests/experimental/test_raster.py index 510865bfef..46d8eea2f0 100644 --- a/lib/iris/tests/experimental/test_raster.py +++ b/lib/iris/tests/experimental/test_raster.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . 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 diff --git a/lib/iris/tests/experimental/ugrid/__init__.py b/lib/iris/tests/experimental/ugrid/__init__.py index d4fea411f2..dcc2b27f2a 100644 --- a/lib/iris/tests/experimental/ugrid/__init__.py +++ b/lib/iris/tests/experimental/ugrid/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,3 +20,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 79d5f55107..30356a501d 100644 --- a/lib/iris/tests/experimental/ugrid/test_ugrid.py +++ b/lib/iris/tests/experimental/ugrid/test_ugrid.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ 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 31e82105ca..84286bbb65 100755 --- a/lib/iris/tests/idiff.py +++ b/lib/iris/tests/idiff.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -23,6 +23,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import os.path import shutil diff --git a/lib/iris/tests/integration/__init__.py b/lib/iris/tests/integration/__init__.py index 152aef9d65..abb8fc8ba1 100644 --- a/lib/iris/tests/integration/__init__.py +++ b/lib/iris/tests/integration/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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/concatenate/__init__.py b/lib/iris/tests/integration/concatenate/__init__.py index 4293239be5..d72f4ee8eb 100644 --- a/lib/iris/tests/integration/concatenate/__init__.py +++ b/lib/iris/tests/integration/concatenate/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 b158216126..d13a8a7e7f 100644 --- a/lib/iris/tests/integration/concatenate/test_concatenate.py +++ b/lib/iris/tests/integration/concatenate/test_concatenate.py @@ -21,7 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/integration/format_interop/__init__.py b/lib/iris/tests/integration/format_interop/__init__.py index 8e97ce1289..a4bacaed91 100644 --- a/lib/iris/tests/integration/format_interop/__init__.py +++ b/lib/iris/tests/integration/format_interop/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 7acc00b92b..5c6eda0bfe 100644 --- a/lib/iris/tests/integration/format_interop/test_name_grib.py +++ b/lib/iris/tests/integration/format_interop/test_name_grib.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. 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 03b44ebc1e..2ded2d1730 100644 --- a/lib/iris/tests/integration/format_interop/test_pp_grib.py +++ b/lib/iris/tests/integration/format_interop/test_pp_grib.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/integration/plot/__init__.py b/lib/iris/tests/integration/plot/__init__.py index 6ea7be1fac..fb405492cf 100644 --- a/lib/iris/tests/integration/plot/__init__.py +++ b/lib/iris/tests/integration/plot/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 b1113674a4..aae46b8efb 100644 --- a/lib/iris/tests/integration/plot/test_colorbar.py +++ b/lib/iris/tests/integration/plot/test_colorbar.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/integration/test_FieldsFileVariant.py b/lib/iris/tests/integration/test_FieldsFileVariant.py index 39d21e5d19..8e218a212a 100644 --- a/lib/iris/tests/integration/test_FieldsFileVariant.py +++ b/lib/iris/tests/integration/test_FieldsFileVariant.py @@ -17,7 +17,7 @@ """Integration tests for loading UM FieldsFile variants.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +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/integration/test_aggregated_cube.py b/lib/iris/tests/integration/test_aggregated_cube.py index 0211690e72..24c85dd00e 100644 --- a/lib/iris/tests/integration/test_aggregated_cube.py +++ b/lib/iris/tests/integration/test_aggregated_cube.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/integration/test_ff.py b/lib/iris/tests/integration/test_ff.py index 0dc958d901..67619d2688 100644 --- a/lib/iris/tests/integration/test_ff.py +++ b/lib/iris/tests/integration/test_ff.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/integration/test_grib2.py b/lib/iris/tests/integration/test_grib2.py index 108999042e..f1c341e124 100644 --- a/lib/iris/tests/integration/test_grib2.py +++ b/lib/iris/tests/integration/test_grib2.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/integration/test_netcdf.py b/lib/iris/tests/integration/test_netcdf.py index a1f51bde90..aa3f193690 100644 --- a/lib/iris/tests/integration/test_netcdf.py +++ b/lib/iris/tests/integration/test_netcdf.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/integration/test_pickle.py b/lib/iris/tests/integration/test_pickle.py index 1e2ae2f5d7..fef13ecfe8 100644 --- a/lib/iris/tests/integration/test_pickle.py +++ b/lib/iris/tests/integration/test_pickle.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/integration/test_pp.py b/lib/iris/tests/integration/test_pp.py index aef6168d83..0326aeaaa6 100644 --- a/lib/iris/tests/integration/test_pp.py +++ b/lib/iris/tests/integration/test_pp.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. 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 58b8cfae73..226ff412aa 100644 --- a/lib/iris/tests/integration/test_pp_constrained_load_cubes.py +++ b/lib/iris/tests/integration/test_pp_constrained_load_cubes.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/integration/test_regridding.py b/lib/iris/tests/integration/test_regridding.py index 6c044eefac..7d3d052ef6 100644 --- a/lib/iris/tests/integration/test_regridding.py +++ b/lib/iris/tests/integration/test_regridding.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/pp.py b/lib/iris/tests/pp.py index 91c98cb94d..cf831d6d8d 100644 --- a/lib/iris/tests/pp.py +++ b/lib/iris/tests/pp.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import contextlib import os.path diff --git a/lib/iris/tests/runner/__init__.py b/lib/iris/tests/runner/__init__.py index 634d65551d..e07487456c 100644 --- a/lib/iris/tests/runner/__init__.py +++ b/lib/iris/tests/runner/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,3 +20,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 53dc65acfd..8b3035fc5d 100644 --- a/lib/iris/tests/runner/__main__.py +++ b/lib/iris/tests/runner/__main__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ 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 db87a693d2..8f053b3d56 100644 --- a/lib/iris/tests/runner/_runner.py +++ b/lib/iris/tests/runner/_runner.py @@ -20,6 +20,7 @@ """ 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 # imports later in the file. diff --git a/lib/iris/tests/stock.py b/lib/iris/tests/stock.py index 0c22dd6a80..b521de34e9 100644 --- a/lib/iris/tests/stock.py +++ b/lib/iris/tests/stock.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +from six.moves import (filter, input, map, range, zip) # noqa import os.path diff --git a/lib/iris/tests/system_test.py b/lib/iris/tests/system_test.py index e7c2455b06..9c0730f213 100644 --- a/lib/iris/tests/system_test.py +++ b/lib/iris/tests/system_test.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -24,6 +24,7 @@ """ from __future__ import (absolute_import, division, 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 d1394004ab..7d36a844ee 100644 --- a/lib/iris/tests/test_abf.py +++ b/lib/iris/tests/test_abf.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2012 - 2014, Met Office +# (C) British Crown Copyright 2012 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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_aggregate_by.py b/lib/iris/tests/test_aggregate_by.py index 17e2f153ec..c8869353ce 100644 --- a/lib/iris/tests/test_aggregate_by.py +++ b/lib/iris/tests/test_aggregate_by.py @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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_analysis.py b/lib/iris/tests/test_analysis.py index 8e219cda6a..9d4b772f8c 100644 --- a/lib/iris/tests/test_analysis.py +++ b/lib/iris/tests/test_analysis.py @@ -17,7 +17,7 @@ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/lib/iris/tests/test_analysis_calculus.py b/lib/iris/tests/test_analysis_calculus.py index ed79d84a60..25d97ab98c 100644 --- a/lib/iris/tests/test_analysis_calculus.py +++ b/lib/iris/tests/test_analysis_calculus.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_basic_maths.py b/lib/iris/tests/test_basic_maths.py index 7fd3f100e4..69a7d79f56 100644 --- a/lib/iris/tests/test_basic_maths.py +++ b/lib/iris/tests/test_basic_maths.py @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_cartography.py b/lib/iris/tests/test_cartography.py index 0eafee68d1..6ec5f37bef 100644 --- a/lib/iris/tests/test_cartography.py +++ b/lib/iris/tests/test_cartography.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_cdm.py b/lib/iris/tests/test_cdm.py index eb68cc0dca..a84a2e5054 100644 --- a/lib/iris/tests/test_cdm.py +++ b/lib/iris/tests/test_cdm.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_cell.py b/lib/iris/tests/test_cell.py index 8d1d4793a6..17823cd6b8 100644 --- a/lib/iris/tests/test_cell.py +++ b/lib/iris/tests/test_cell.py @@ -17,6 +17,7 @@ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_cf.py b/lib/iris/tests/test_cf.py index aea735ecc9..72a0ecce9f 100644 --- a/lib/iris/tests/test_cf.py +++ b/lib/iris/tests/test_cf.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_coding_standards.py b/lib/iris/tests/test_coding_standards.py index b75f90462b..22609ae2b8 100644 --- a/lib/iris/tests/test_coding_standards.py +++ b/lib/iris/tests/test_coding_standards.py @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa from datetime import datetime from fnmatch import fnmatch diff --git a/lib/iris/tests/test_concatenate.py b/lib/iris/tests/test_concatenate.py index 8b6cc4c3b0..ab1e13bc3e 100644 --- a/lib/iris/tests/test_concatenate.py +++ b/lib/iris/tests/test_concatenate.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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_constraints.py b/lib/iris/tests/test_constraints.py index 94a817c2d4..e411885430 100644 --- a/lib/iris/tests/test_constraints.py +++ b/lib/iris/tests/test_constraints.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/lib/iris/tests/test_coord_api.py b/lib/iris/tests/test_coord_api.py index f31939ed34..d4a303195f 100644 --- a/lib/iris/tests/test_coord_api.py +++ b/lib/iris/tests/test_coord_api.py @@ -17,7 +17,7 @@ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/lib/iris/tests/test_coord_categorisation.py b/lib/iris/tests/test_coord_categorisation.py index 0afb4e97a8..85b9e7d0b3 100644 --- a/lib/iris/tests/test_coord_categorisation.py +++ b/lib/iris/tests/test_coord_categorisation.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -19,6 +19,7 @@ """ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_coordsystem.py b/lib/iris/tests/test_coordsystem.py index 585432f783..a5619e917b 100644 --- a/lib/iris/tests/test_coordsystem.py +++ b/lib/iris/tests/test_coordsystem.py @@ -17,6 +17,7 @@ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_cube.py b/lib/iris/tests/test_cube.py index f6aae9c105..efd1c6a5ec 100644 --- a/lib/iris/tests/test_cube.py +++ b/lib/iris/tests/test_cube.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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_to_pp.py b/lib/iris/tests/test_cube_to_pp.py index b24f71ba16..16264aa0a5 100644 --- a/lib/iris/tests/test_cube_to_pp.py +++ b/lib/iris/tests/test_cube_to_pp.py @@ -16,7 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +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/lib/iris/tests/test_ff.py b/lib/iris/tests/test_ff.py index 8f0f8bb728..4106f4a3d3 100644 --- a/lib/iris/tests/test_ff.py +++ b/lib/iris/tests/test_ff.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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_load.py b/lib/iris/tests/test_file_load.py index da983efb49..11fd5c5f1c 100644 --- a/lib/iris/tests/test_file_load.py +++ b/lib/iris/tests/test_file_load.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_file_save.py b/lib/iris/tests/test_file_save.py index 09fb49ad67..69a2d8284c 100644 --- a/lib/iris/tests/test_file_save.py +++ b/lib/iris/tests/test_file_save.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_grib_load.py b/lib/iris/tests/test_grib_load.py index ae39628252..215f074c8f 100644 --- a/lib/iris/tests/test_grib_load.py +++ b/lib/iris/tests/test_grib_load.py @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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_phenomenon_translations.py b/lib/iris/tests/test_grib_phenomenon_translations.py index b0af22512f..99dcf0da8d 100644 --- a/lib/iris/tests/test_grib_phenomenon_translations.py +++ b/lib/iris/tests/test_grib_phenomenon_translations.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ ''' from __future__ import (absolute_import, division, 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.py b/lib/iris/tests/test_grib_save.py index 095807f16a..f92ea68c39 100644 --- a/lib/iris/tests/test_grib_save.py +++ b/lib/iris/tests/test_grib_save.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_grib_save_rules.py b/lib/iris/tests/test_grib_save_rules.py index 82d1678051..ba58ad95f0 100644 --- a/lib/iris/tests/test_grib_save_rules.py +++ b/lib/iris/tests/test_grib_save_rules.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Unit tests for :mod:`iris.fileformats.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 import iris.tests as tests diff --git a/lib/iris/tests/test_hybrid.py b/lib/iris/tests/test_hybrid.py index 2ceb401f64..2007f03fb7 100644 --- a/lib/iris/tests/test_hybrid.py +++ b/lib/iris/tests/test_hybrid.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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_interpolation.py b/lib/iris/tests/test_interpolation.py index 3feadbda65..35742cd589 100644 --- a/lib/iris/tests/test_interpolation.py +++ b/lib/iris/tests/test_interpolation.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_intersect.py b/lib/iris/tests/test_intersect.py index 75c4fb464a..e068bc8654 100644 --- a/lib/iris/tests/test_intersect.py +++ b/lib/iris/tests/test_intersect.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_io_init.py b/lib/iris/tests/test_io_init.py index f3f28c4a72..b7afcb9fa7 100644 --- a/lib/iris/tests/test_io_init.py +++ b/lib/iris/tests/test_io_init.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_iterate.py b/lib/iris/tests/test_iterate.py index ade8cc8be5..cc7a1c318e 100644 --- a/lib/iris/tests/test_iterate.py +++ b/lib/iris/tests/test_iterate.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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_load.py b/lib/iris/tests/test_load.py index f53ab0ff01..5330833a0b 100644 --- a/lib/iris/tests/test_load.py +++ b/lib/iris/tests/test_load.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_mapping.py b/lib/iris/tests/test_mapping.py index 35f19ef4f6..b2ff9062fc 100644 --- a/lib/iris/tests/test_mapping.py +++ b/lib/iris/tests/test_mapping.py @@ -19,7 +19,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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_merge.py b/lib/iris/tests/test_merge.py index 02cea278bf..0be053f692 100644 --- a/lib/iris/tests/test_merge.py +++ b/lib/iris/tests/test_merge.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/lib/iris/tests/test_name.py b/lib/iris/tests/test_name.py index afea0763e2..d859a7f1d9 100644 --- a/lib/iris/tests/test_name.py +++ b/lib/iris/tests/test_name.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else diff --git a/lib/iris/tests/test_netcdf.py b/lib/iris/tests/test_netcdf.py index 10ecbb1c9f..6ecaa5e17f 100644 --- a/lib/iris/tests/test_netcdf.py +++ b/lib/iris/tests/test_netcdf.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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_nimrod.py b/lib/iris/tests/test_nimrod.py index c3125dbccd..136544e1a9 100644 --- a/lib/iris/tests/test_nimrod.py +++ b/lib/iris/tests/test_nimrod.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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_pandas.py b/lib/iris/tests/test_pandas.py index e8e8755012..00ba0f3c43 100644 --- a/lib/iris/tests/test_pandas.py +++ b/lib/iris/tests/test_pandas.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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_peak.py b/lib/iris/tests/test_peak.py index 627bf241c9..94ca6d9701 100644 --- a/lib/iris/tests/test_peak.py +++ b/lib/iris/tests/test_peak.py @@ -16,6 +16,7 @@ # along with Iris. If not, see . 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 diff --git a/lib/iris/tests/test_pickling.py b/lib/iris/tests/test_pickling.py index d31cca1292..83e5a342d3 100644 --- a/lib/iris/tests/test_pickling.py +++ b/lib/iris/tests/test_pickling.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +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/lib/iris/tests/test_plot.py b/lib/iris/tests/test_plot.py index bf554d27c4..e669f6c67e 100644 --- a/lib/iris/tests/test_plot.py +++ b/lib/iris/tests/test_plot.py @@ -16,7 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) -from six.moves import range +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_cf.py b/lib/iris/tests/test_pp_cf.py index d8865f45b9..a0120bc055 100644 --- a/lib/iris/tests/test_pp_cf.py +++ b/lib/iris/tests/test_pp_cf.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_pp_module.py b/lib/iris/tests/test_pp_module.py index 3e25cb839d..4154870d68 100644 --- a/lib/iris/tests/test_pp_module.py +++ b/lib/iris/tests/test_pp_module.py @@ -16,7 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +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/lib/iris/tests/test_pp_stash.py b/lib/iris/tests/test_pp_stash.py index 61def34a74..817d9ea287 100644 --- a/lib/iris/tests/test_pp_stash.py +++ b/lib/iris/tests/test_pp_stash.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_pp_to_cube.py b/lib/iris/tests/test_pp_to_cube.py index 5d71323403..d0cfb90060 100644 --- a/lib/iris/tests/test_pp_to_cube.py +++ b/lib/iris/tests/test_pp_to_cube.py @@ -16,7 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/lib/iris/tests/test_quickplot.py b/lib/iris/tests/test_quickplot.py index 9b62ab202d..ef26e8b609 100644 --- a/lib/iris/tests/test_quickplot.py +++ b/lib/iris/tests/test_quickplot.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_regrid.py b/lib/iris/tests/test_regrid.py index a4a632f67b..463bd8a7cb 100644 --- a/lib/iris/tests/test_regrid.py +++ b/lib/iris/tests/test_regrid.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_rules.py b/lib/iris/tests/test_rules.py index 0d4ad343bb..bd7f9390ca 100644 --- a/lib/iris/tests/test_rules.py +++ b/lib/iris/tests/test_rules.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/lib/iris/tests/test_std_names.py b/lib/iris/tests/test_std_names.py index b4aa1e4d7d..e5e203b24e 100644 --- a/lib/iris/tests/test_std_names.py +++ b/lib/iris/tests/test_std_names.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import unittest diff --git a/lib/iris/tests/test_trajectory.py b/lib/iris/tests/test_trajectory.py index 217b4b1af1..0de1f00694 100644 --- a/lib/iris/tests/test_trajectory.py +++ b/lib/iris/tests/test_trajectory.py @@ -16,7 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/lib/iris/tests/test_unit.py b/lib/iris/tests/test_unit.py index d282573607..d62b06b8cf 100644 --- a/lib/iris/tests/test_unit.py +++ b/lib/iris/tests/test_unit.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_uri_callback.py b/lib/iris/tests/test_uri_callback.py index d45197ec08..287ae3fa37 100644 --- a/lib/iris/tests/test_uri_callback.py +++ b/lib/iris/tests/test_uri_callback.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/test_util.py b/lib/iris/tests/test_util.py index bec3d2c00b..d9047097a3 100644 --- a/lib/iris/tests/test_util.py +++ b/lib/iris/tests/test_util.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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_verbose_logging.py b/lib/iris/tests/test_verbose_logging.py index db7348fbc5..ec77292804 100644 --- a/lib/iris/tests/test_verbose_logging.py +++ b/lib/iris/tests/test_verbose_logging.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, 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 import iris.tests as tests diff --git a/lib/iris/tests/unit/__init__.py b/lib/iris/tests/unit/__init__.py index e18d93b1e7..7d2010e304 100644 --- a/lib/iris/tests/unit/__init__.py +++ b/lib/iris/tests/unit/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 eee889692f..e118182e0b 100644 --- a/lib/iris/tests/unit/analysis/__init__.py +++ b/lib/iris/tests/unit/analysis/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/area_weighted/__init__.py b/lib/iris/tests/unit/analysis/area_weighted/__init__.py index 986a7ec634..6e266c3a96 100644 --- a/lib/iris/tests/unit/analysis/area_weighted/__init__.py +++ b/lib/iris/tests/unit/analysis/area_weighted/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 542af58a45..1246060e10 100644 --- a/lib/iris/tests/unit/analysis/area_weighted/test_AreaWeightedRegridder.py +++ b/lib/iris/tests/unit/analysis/area_weighted/test_AreaWeightedRegridder.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/analysis/cartography/__init__.py b/lib/iris/tests/unit/analysis/cartography/__init__.py index abf75100a4..ce4cc8fbf8 100644 --- a/lib/iris/tests/unit/analysis/cartography/__init__.py +++ b/lib/iris/tests/unit/analysis/cartography/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 006dfdfb50..3a81838ad1 100644 --- a/lib/iris/tests/unit/analysis/cartography/test__quadrant_area.py +++ b/lib/iris/tests/unit/analysis/cartography/test__quadrant_area.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -18,6 +18,7 @@ """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 # importing anything else. 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 b0f1c03c92..7b1f829eb1 100644 --- a/lib/iris/tests/unit/analysis/cartography/test_area_weights.py +++ b/lib/iris/tests/unit/analysis/cartography/test_area_weights.py @@ -21,6 +21,7 @@ # 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 import iris.analysis.cartography diff --git a/lib/iris/tests/unit/analysis/cartography/test_project.py b/lib/iris/tests/unit/analysis/cartography/test_project.py index 3be2a9ba11..f5c6196a24 100644 --- a/lib/iris/tests/unit/analysis/cartography/test_project.py +++ b/lib/iris/tests/unit/analysis/cartography/test_project.py @@ -17,6 +17,7 @@ """Unit tests for the :func:`iris.analysis.cartography.project` 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 # importing anything else. 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 ae109e896a..617d919293 100644 --- a/lib/iris/tests/unit/analysis/cartography/test_rotate_winds.py +++ b/lib/iris/tests/unit/analysis/cartography/test_rotate_winds.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/analysis/geometry/__init__.py b/lib/iris/tests/unit/analysis/geometry/__init__.py index 21292e1de2..31c8906f83 100644 --- a/lib/iris/tests/unit/analysis/geometry/__init__.py +++ b/lib/iris/tests/unit/analysis/geometry/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 e89321c1ba..ca77946e57 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/analysis/geometry/test_geometry_area_weights.py b/lib/iris/tests/unit/analysis/geometry/test_geometry_area_weights.py index f2e56248f1..ff34d9566d 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/analysis/interpolate/__init__.py b/lib/iris/tests/unit/analysis/interpolate/__init__.py index 2b191875bd..a78d155387 100644 --- a/lib/iris/tests/unit/analysis/interpolate/__init__.py +++ b/lib/iris/tests/unit/analysis/interpolate/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """Unit tests for the :mod:`iris.analysis.interpolate` 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/interpolate/test_linear.py b/lib/iris/tests/unit/analysis/interpolate/test_linear.py index 3c227673c5..4676db06ee 100644 --- a/lib/iris/tests/unit/analysis/interpolate/test_linear.py +++ b/lib/iris/tests/unit/analysis/interpolate/test_linear.py @@ -17,6 +17,7 @@ """Unit tests for the :func:`iris.analysis.interpolate.linear` 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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/interpolation/__init__.py b/lib/iris/tests/unit/analysis/interpolation/__init__.py index ec43217ce1..62af236e70 100644 --- a/lib/iris/tests/unit/analysis/interpolation/__init__.py +++ b/lib/iris/tests/unit/analysis/interpolation/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 3230ea3c4a..f25a11bba7 100644 --- a/lib/iris/tests/unit/analysis/interpolation/test_RectilinearInterpolator.py +++ b/lib/iris/tests/unit/analysis/interpolation/test_RectilinearInterpolator.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/analysis/interpolation/test_get_xy_dim_coords.py b/lib/iris/tests/unit/analysis/interpolation/test_get_xy_dim_coords.py index 5978f47036..d4fc866714 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/analysis/maths/__init__.py b/lib/iris/tests/unit/analysis/maths/__init__.py index 8d92f51278..3b13872f63 100644 --- a/lib/iris/tests/unit/analysis/maths/__init__.py +++ b/lib/iris/tests/unit/analysis/maths/__init__.py @@ -17,7 +17,7 @@ """Unit tests for the :mod:`iris.analysis.maths` module.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range +from six.moves import (filter, input, map, range, zip) # noqa from abc import ABCMeta, abstractproperty diff --git a/lib/iris/tests/unit/analysis/maths/test_add.py b/lib/iris/tests/unit/analysis/maths/test_add.py index d9c4928e5e..af2c7eb330 100644 --- a/lib/iris/tests/unit/analysis/maths/test_add.py +++ b/lib/iris/tests/unit/analysis/maths/test_add.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/maths/test_divide.py b/lib/iris/tests/unit/analysis/maths/test_divide.py index 4d57806a8c..dc5ed22037 100644 --- a/lib/iris/tests/unit/analysis/maths/test_divide.py +++ b/lib/iris/tests/unit/analysis/maths/test_divide.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/maths/test_multiply.py b/lib/iris/tests/unit/analysis/maths/test_multiply.py index 49613725a0..5dbd089a09 100644 --- a/lib/iris/tests/unit/analysis/maths/test_multiply.py +++ b/lib/iris/tests/unit/analysis/maths/test_multiply.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/maths/test_subtract.py b/lib/iris/tests/unit/analysis/maths/test_subtract.py index 623e14e613..0b4e4a8568 100644 --- a/lib/iris/tests/unit/analysis/maths/test_subtract.py +++ b/lib/iris/tests/unit/analysis/maths/test_subtract.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/regrid/__init__.py b/lib/iris/tests/unit/analysis/regrid/__init__.py index 5c80109dde..6d2062c278 100644 --- a/lib/iris/tests/unit/analysis/regrid/__init__.py +++ b/lib/iris/tests/unit/analysis/regrid/__init__.py @@ -17,3 +17,4 @@ """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 1eb4b2041f..d5fbc015ab 100644 --- a/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py +++ b/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py @@ -17,7 +17,7 @@ """Unit tests for :class:`iris.analysis._regrid.RectilinearRegridder`.""" from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/unit/analysis/scipy_interpolate/test__RegularGridInterpolator.py b/lib/iris/tests/unit/analysis/scipy_interpolate/test__RegularGridInterpolator.py index 040cfe4745..326029cbe8 100644 --- a/lib/iris/tests/unit/analysis/scipy_interpolate/test__RegularGridInterpolator.py +++ b/lib/iris/tests/unit/analysis/scipy_interpolate/test__RegularGridInterpolator.py @@ -18,6 +18,7 @@ :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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/test_Aggregator.py b/lib/iris/tests/unit/analysis/test_Aggregator.py index cebf40aa7e..9856a078f3 100644 --- a/lib/iris/tests/unit/analysis/test_Aggregator.py +++ b/lib/iris/tests/unit/analysis/test_Aggregator.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/test_AreaWeighted.py b/lib/iris/tests/unit/analysis/test_AreaWeighted.py index 8ab1f185d5..2b45b86da4 100644 --- a/lib/iris/tests/unit/analysis/test_AreaWeighted.py +++ b/lib/iris/tests/unit/analysis/test_AreaWeighted.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/test_COUNT.py b/lib/iris/tests/unit/analysis/test_COUNT.py index 1855760182..4d8b48b43a 100644 --- a/lib/iris/tests/unit/analysis/test_COUNT.py +++ b/lib/iris/tests/unit/analysis/test_COUNT.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/test_Linear.py b/lib/iris/tests/unit/analysis/test_Linear.py index 1e841e4d2c..a8e45d1446 100644 --- a/lib/iris/tests/unit/analysis/test_Linear.py +++ b/lib/iris/tests/unit/analysis/test_Linear.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/test_MEAN.py b/lib/iris/tests/unit/analysis/test_MEAN.py index c19ca44a7e..95a22ddad3 100644 --- a/lib/iris/tests/unit/analysis/test_MEAN.py +++ b/lib/iris/tests/unit/analysis/test_MEAN.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/test_Nearest.py b/lib/iris/tests/unit/analysis/test_Nearest.py index 0720cffe7f..e7b3a75e77 100644 --- a/lib/iris/tests/unit/analysis/test_Nearest.py +++ b/lib/iris/tests/unit/analysis/test_Nearest.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/test_PERCENTILE.py b/lib/iris/tests/unit/analysis/test_PERCENTILE.py index 8bce1d1987..0ebdffa7ef 100644 --- a/lib/iris/tests/unit/analysis/test_PERCENTILE.py +++ b/lib/iris/tests/unit/analysis/test_PERCENTILE.py @@ -17,7 +17,7 @@ """Unit tests for the :data:`iris.analysis.PERCENTILE` aggregator.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/analysis/test_PROPORTION.py b/lib/iris/tests/unit/analysis/test_PROPORTION.py index 9cf9dfce66..54d30c5964 100644 --- a/lib/iris/tests/unit/analysis/test_PROPORTION.py +++ b/lib/iris/tests/unit/analysis/test_PROPORTION.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/test_PercentileAggregator.py b/lib/iris/tests/unit/analysis/test_PercentileAggregator.py index 7e1d510258..6db9bdf524 100644 --- a/lib/iris/tests/unit/analysis/test_PercentileAggregator.py +++ b/lib/iris/tests/unit/analysis/test_PercentileAggregator.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/analysis/test_RMS.py b/lib/iris/tests/unit/analysis/test_RMS.py index 63bbf6fa2e..57d92cd3c6 100644 --- a/lib/iris/tests/unit/analysis/test_RMS.py +++ b/lib/iris/tests/unit/analysis/test_RMS.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/test_STD_DEV.py b/lib/iris/tests/unit/analysis/test_STD_DEV.py index 9468222d2f..442ccf367e 100644 --- a/lib/iris/tests/unit/analysis/test_STD_DEV.py +++ b/lib/iris/tests/unit/analysis/test_STD_DEV.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/test_VARIANCE.py b/lib/iris/tests/unit/analysis/test_VARIANCE.py index fc60d08dd4..0a6235a856 100644 --- a/lib/iris/tests/unit/analysis/test_VARIANCE.py +++ b/lib/iris/tests/unit/analysis/test_VARIANCE.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/analysis/test_WPERCENTILE.py b/lib/iris/tests/unit/analysis/test_WPERCENTILE.py index d78beb9ff2..ff7bd6cd67 100644 --- a/lib/iris/tests/unit/analysis/test_WPERCENTILE.py +++ b/lib/iris/tests/unit/analysis/test_WPERCENTILE.py @@ -17,7 +17,7 @@ """Unit tests for the :data:`iris.analysis.PERCENTILE` aggregator.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/analysis/test_WeightedPercentileAggregator.py b/lib/iris/tests/unit/analysis/test_WeightedPercentileAggregator.py index d2860c969c..04725bb1ea 100644 --- a/lib/iris/tests/unit/analysis/test_WeightedPercentileAggregator.py +++ b/lib/iris/tests/unit/analysis/test_WeightedPercentileAggregator.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/aux_factory/__init__.py b/lib/iris/tests/unit/aux_factory/__init__.py index b47cdb5abf..2e95470f7f 100644 --- a/lib/iris/tests/unit/aux_factory/__init__.py +++ b/lib/iris/tests/unit/aux_factory/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 531b6525eb..f0a3b00dc1 100644 --- a/lib/iris/tests/unit/aux_factory/test_AuxCoordFactory.py +++ b/lib/iris/tests/unit/aux_factory/test_AuxCoordFactory.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/aux_factory/test_HybridPressureFactory.py b/lib/iris/tests/unit/aux_factory/test_HybridPressureFactory.py index 5ee15b9686..c62d09ed47 100644 --- a/lib/iris/tests/unit/aux_factory/test_HybridPressureFactory.py +++ b/lib/iris/tests/unit/aux_factory/test_HybridPressureFactory.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/aux_factory/test_OceanSFactory.py b/lib/iris/tests/unit/aux_factory/test_OceanSFactory.py index 01384b636d..c10dcfa4a3 100644 --- a/lib/iris/tests/unit/aux_factory/test_OceanSFactory.py +++ b/lib/iris/tests/unit/aux_factory/test_OceanSFactory.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/aux_factory/test_OceanSg1Factory.py b/lib/iris/tests/unit/aux_factory/test_OceanSg1Factory.py index fa95fb9867..b202d2663e 100644 --- a/lib/iris/tests/unit/aux_factory/test_OceanSg1Factory.py +++ b/lib/iris/tests/unit/aux_factory/test_OceanSg1Factory.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/aux_factory/test_OceanSg2Factory.py b/lib/iris/tests/unit/aux_factory/test_OceanSg2Factory.py index d0e1421004..dd52c10808 100644 --- a/lib/iris/tests/unit/aux_factory/test_OceanSg2Factory.py +++ b/lib/iris/tests/unit/aux_factory/test_OceanSg2Factory.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/aux_factory/test_OceanSigmaFactory.py b/lib/iris/tests/unit/aux_factory/test_OceanSigmaFactory.py index afa29e55f9..aeb372569a 100644 --- a/lib/iris/tests/unit/aux_factory/test_OceanSigmaFactory.py +++ b/lib/iris/tests/unit/aux_factory/test_OceanSigmaFactory.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/aux_factory/test_OceanSigmaZFactory.py b/lib/iris/tests/unit/aux_factory/test_OceanSigmaZFactory.py index 34e2b26a1e..7af354e69f 100644 --- a/lib/iris/tests/unit/aux_factory/test_OceanSigmaZFactory.py +++ b/lib/iris/tests/unit/aux_factory/test_OceanSigmaZFactory.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/concatenate/__init__.py b/lib/iris/tests/unit/concatenate/__init__.py index 8548a6dfdf..5483ef78b5 100644 --- a/lib/iris/tests/unit/concatenate/__init__.py +++ b/lib/iris/tests/unit/concatenate/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 c4afa4042c..38e47a7c44 100644 --- a/lib/iris/tests/unit/concatenate/test__CubeSignature.py +++ b/lib/iris/tests/unit/concatenate/test__CubeSignature.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # before importing anything else. diff --git a/lib/iris/tests/unit/concatenate/test_concatenate.py b/lib/iris/tests/unit/concatenate/test_concatenate.py index 76e2bd64d3..2112998386 100644 --- a/lib/iris/tests/unit/concatenate/test_concatenate.py +++ b/lib/iris/tests/unit/concatenate/test_concatenate.py @@ -17,7 +17,7 @@ """Test function :func:`iris._concatenate.concatenate.py`.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +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/unit/coord_categorisation/__init__.py b/lib/iris/tests/unit/coord_categorisation/__init__.py index 270354934c..5db08e8773 100644 --- a/lib/iris/tests/unit/coord_categorisation/__init__.py +++ b/lib/iris/tests/unit/coord_categorisation/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 98916ad1d5..76e0f73ac9 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 @@ -17,7 +17,7 @@ """Test function :func:`iris.coord_categorisation.add_categorised_coord`.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/coord_systems/__init__.py b/lib/iris/tests/unit/coord_systems/__init__.py index ceac488cea..c7bfcb2dcf 100644 --- a/lib/iris/tests/unit/coord_systems/__init__.py +++ b/lib/iris/tests/unit/coord_systems/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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_Orthographic.py b/lib/iris/tests/unit/coord_systems/test_Orthographic.py index e8dfdbf40e..b15387581d 100644 --- a/lib/iris/tests/unit/coord_systems/test_Orthographic.py +++ b/lib/iris/tests/unit/coord_systems/test_Orthographic.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/coord_systems/test_RotatedPole.py b/lib/iris/tests/unit/coord_systems/test_RotatedPole.py index 3087959ecf..4f8594d9d3 100644 --- a/lib/iris/tests/unit/coord_systems/test_RotatedPole.py +++ b/lib/iris/tests/unit/coord_systems/test_RotatedPole.py @@ -17,6 +17,7 @@ """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 mock # 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 731d11947d..e225355d11 100644 --- a/lib/iris/tests/unit/coord_systems/test_VerticalPerspective.py +++ b/lib/iris/tests/unit/coord_systems/test_VerticalPerspective.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/coords/__init__.py b/lib/iris/tests/unit/coords/__init__.py index 2ed76359bf..94b562fe97 100644 --- a/lib/iris/tests/unit/coords/__init__.py +++ b/lib/iris/tests/unit/coords/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """Unit tests for the :mod:`iris.coords` 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/coords/test_Cell.py b/lib/iris/tests/unit/coords/test_Cell.py index a93eec4bcd..b006ae813c 100644 --- a/lib/iris/tests/unit/coords/test_Cell.py +++ b/lib/iris/tests/unit/coords/test_Cell.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/coords/test_Coord.py b/lib/iris/tests/unit/coords/test_Coord.py index 67ca9e3913..c80fbf8d87 100644 --- a/lib/iris/tests/unit/coords/test_Coord.py +++ b/lib/iris/tests/unit/coords/test_Coord.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/cube/__init__.py b/lib/iris/tests/unit/cube/__init__.py index e7b11341f1..3b49e3f75d 100644 --- a/lib/iris/tests/unit/cube/__init__.py +++ b/lib/iris/tests/unit/cube/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 09cf161b71..11c395e932 100644 --- a/lib/iris/tests/unit/cube/test_Cube.py +++ b/lib/iris/tests/unit/cube/test_Cube.py @@ -17,7 +17,7 @@ """Unit tests for the `iris.cube.Cube` class.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +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/unit/cube/test_CubeList.py b/lib/iris/tests/unit/cube/test_CubeList.py index e7088df68b..0009059d6e 100644 --- a/lib/iris/tests/unit/cube/test_CubeList.py +++ b/lib/iris/tests/unit/cube/test_CubeList.py @@ -17,7 +17,7 @@ """Unit tests for the `iris.cube.CubeList` class.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/experimental/__init__.py b/lib/iris/tests/unit/experimental/__init__.py index 450005be3b..25b2d4a6ac 100644 --- a/lib/iris/tests/unit/experimental/__init__.py +++ b/lib/iris/tests/unit/experimental/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 9bafff43a3..ef318b2023 100644 --- a/lib/iris/tests/unit/experimental/equalise_cubes/__init__.py +++ b/lib/iris/tests/unit/experimental/equalise_cubes/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 1e14ac3d7a..00cd7b743e 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 @@ -21,7 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/unit/experimental/fieldsfile/__init__.py b/lib/iris/tests/unit/experimental/fieldsfile/__init__.py index d402be477b..8513b08fdb 100644 --- a/lib/iris/tests/unit/experimental/fieldsfile/__init__.py +++ b/lib/iris/tests/unit/experimental/fieldsfile/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """Unit tests for :mod:`iris.experimental.fieldsfile`.""" 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/fieldsfile/test__convert_collation.py b/lib/iris/tests/unit/experimental/fieldsfile/test__convert_collation.py index 3eba975026..30a766a8aa 100644 --- a/lib/iris/tests/unit/experimental/fieldsfile/test__convert_collation.py +++ b/lib/iris/tests/unit/experimental/fieldsfile/test__convert_collation.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Unit tests for :func:`iris.experimental.fieldsfile._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 # importing anything else. diff --git a/lib/iris/tests/unit/experimental/raster/__init__.py b/lib/iris/tests/unit/experimental/raster/__init__.py index a55ec0c17e..5532dda673 100644 --- a/lib/iris/tests/unit/experimental/raster/__init__.py +++ b/lib/iris/tests/unit/experimental/raster/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 e5e1526892..30a841391b 100644 --- a/lib/iris/tests/unit/experimental/raster/test_export_geotiff.py +++ b/lib/iris/tests/unit/experimental/raster/test_export_geotiff.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/experimental/regrid/__init__.py b/lib/iris/tests/unit/experimental/regrid/__init__.py index d19450e2b5..2ba5c78a6e 100644 --- a/lib/iris/tests/unit/experimental/regrid/__init__.py +++ b/lib/iris/tests/unit/experimental/regrid/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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_CurviliearRegridder.py b/lib/iris/tests/unit/experimental/regrid/test_CurviliearRegridder.py index 438f06f576..3ac405e50e 100644 --- a/lib/iris/tests/unit/experimental/regrid/test_CurviliearRegridder.py +++ b/lib/iris/tests/unit/experimental/regrid/test_CurviliearRegridder.py @@ -17,6 +17,7 @@ """Unit tests for :class:`iris.experimental.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 # importing anything else. diff --git a/lib/iris/tests/unit/experimental/regrid/test_PointInCell.py b/lib/iris/tests/unit/experimental/regrid/test_PointInCell.py index aae39b069f..17f0bbc379 100644 --- a/lib/iris/tests/unit/experimental/regrid/test_PointInCell.py +++ b/lib/iris/tests/unit/experimental/regrid/test_PointInCell.py @@ -17,6 +17,7 @@ """Unit tests for :class:`iris.experimental.regrid.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 # importing anything else. 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 54f8eab728..16a63f4d6a 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/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 e99401bad8..f72f60f1a8 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 @@ -21,7 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/unit/experimental/um/__init__.py b/lib/iris/tests/unit/experimental/um/__init__.py index e6c62d9f32..1e87cb4a33 100644 --- a/lib/iris/tests/unit/experimental/um/__init__.py +++ b/lib/iris/tests/unit/experimental/um/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """Unit tests for the :mod:`iris.experimental.um` 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/um/test_Field.py b/lib/iris/tests/unit/experimental/um/test_Field.py index 092d278f14..9d294ca373 100644 --- a/lib/iris/tests/unit/experimental/um/test_Field.py +++ b/lib/iris/tests/unit/experimental/um/test_Field.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/experimental/um/test_Field2.py b/lib/iris/tests/unit/experimental/um/test_Field2.py index 91477904f0..3485e95b94 100644 --- a/lib/iris/tests/unit/experimental/um/test_Field2.py +++ b/lib/iris/tests/unit/experimental/um/test_Field2.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/experimental/um/test_Field3.py b/lib/iris/tests/unit/experimental/um/test_Field3.py index 30c3544028..7d5b5be008 100644 --- a/lib/iris/tests/unit/experimental/um/test_Field3.py +++ b/lib/iris/tests/unit/experimental/um/test_Field3.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/experimental/um/test_FieldsFileVariant.py b/lib/iris/tests/unit/experimental/um/test_FieldsFileVariant.py index b2f62f975b..63ed727a7b 100644 --- a/lib/iris/tests/unit/experimental/um/test_FieldsFileVariant.py +++ b/lib/iris/tests/unit/experimental/um/test_FieldsFileVariant.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/experimental/um/test_FixedLengthHeader.py b/lib/iris/tests/unit/experimental/um/test_FixedLengthHeader.py index dc78b17f42..6210b73058 100644 --- a/lib/iris/tests/unit/experimental/um/test_FixedLengthHeader.py +++ b/lib/iris/tests/unit/experimental/um/test_FixedLengthHeader.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/fileformats/__init__.py b/lib/iris/tests/unit/fileformats/__init__.py index f98d6d382e..d7cc3b44e7 100644 --- a/lib/iris/tests/unit/fileformats/__init__.py +++ b/lib/iris/tests/unit/fileformats/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 6d1b1bce1d..e11be995b3 100644 --- a/lib/iris/tests/unit/fileformats/abf/__init__.py +++ b/lib/iris/tests/unit/fileformats/abf/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 522a2c468f..8d7904398a 100644 --- a/lib/iris/tests/unit/fileformats/abf/test_ABFField.py +++ b/lib/iris/tests/unit/fileformats/abf/test_ABFField.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/cf/__init__.py b/lib/iris/tests/unit/fileformats/cf/__init__.py index c5b92e4995..c5a6ad4ca2 100644 --- a/lib/iris/tests/unit/fileformats/cf/__init__.py +++ b/lib/iris/tests/unit/fileformats/cf/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 a6d42f5d3e..461f0a8f92 100644 --- a/lib/iris/tests/unit/fileformats/cf/test_CFReader.py +++ b/lib/iris/tests/unit/fileformats/cf/test_CFReader.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/unit/fileformats/ff/__init__.py b/lib/iris/tests/unit/fileformats/ff/__init__.py index 8bc1ff29e5..5b1656950a 100644 --- a/lib/iris/tests/unit/fileformats/ff/__init__.py +++ b/lib/iris/tests/unit/fileformats/ff/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 074f30f5de..d98aa5c49f 100644 --- a/lib/iris/tests/unit/fileformats/ff/test_ArakawaC.py +++ b/lib/iris/tests/unit/fileformats/ff/test_ArakawaC.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/ff/test_ENDGame.py b/lib/iris/tests/unit/fileformats/ff/test_ENDGame.py index 29ade55471..f9689a4db5 100644 --- a/lib/iris/tests/unit/fileformats/ff/test_ENDGame.py +++ b/lib/iris/tests/unit/fileformats/ff/test_ENDGame.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/ff/test_FF2PP.py b/lib/iris/tests/unit/fileformats/ff/test_FF2PP.py index d0be4e0e01..9c6ad00c02 100644 --- a/lib/iris/tests/unit/fileformats/ff/test_FF2PP.py +++ b/lib/iris/tests/unit/fileformats/ff/test_FF2PP.py @@ -17,7 +17,7 @@ """Unit tests for the :class:`iris.fileformat.ff.FF2PP` class.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/fileformats/ff/test_FFHeader.py b/lib/iris/tests/unit/fileformats/ff/test_FFHeader.py index 56849d8ca4..e144e4ef5e 100644 --- a/lib/iris/tests/unit/fileformats/ff/test_FFHeader.py +++ b/lib/iris/tests/unit/fileformats/ff/test_FFHeader.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/ff/test_Grid.py b/lib/iris/tests/unit/fileformats/ff/test_Grid.py index ff4c2e76ee..9b568cef75 100644 --- a/lib/iris/tests/unit/fileformats/ff/test_Grid.py +++ b/lib/iris/tests/unit/fileformats/ff/test_Grid.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/ff/test_NewDynamics.py b/lib/iris/tests/unit/fileformats/ff/test_NewDynamics.py index 4428b86da0..a409706a7d 100644 --- a/lib/iris/tests/unit/fileformats/ff/test_NewDynamics.py +++ b/lib/iris/tests/unit/fileformats/ff/test_NewDynamics.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/grib/__init__.py b/lib/iris/tests/unit/fileformats/grib/__init__.py index e39d3b8e36..b080a1bd84 100644 --- a/lib/iris/tests/unit/fileformats/grib/__init__.py +++ b/lib/iris/tests/unit/fileformats/grib/__init__.py @@ -17,6 +17,7 @@ """Unit tests for the :mod:`iris.fileformats.grib` package.""" from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import mock diff --git a/lib/iris/tests/unit/fileformats/grib/load_convert/__init__.py b/lib/iris/tests/unit/fileformats/grib/load_convert/__init__.py index ae071fe81d..b6afad2e24 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/__init__.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Unit tests for the :mod:`iris.fileformats.grib._load_convert` 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 importing anything else. diff --git a/lib/iris/tests/unit/fileformats/grib/load_convert/test__hindcast_fix.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test__hindcast_fix.py index 716c75db27..186a431074 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test__hindcast_fix.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test__hindcast_fix.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_bitmap_section.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_bitmap_section.py index 6b74560b64..dbfef702c5 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_bitmap_section.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_bitmap_section.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_convert.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_convert.py index 88246fe3af..e89d370ad5 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_convert.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_convert.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Test function :func:`iris.fileformats.grib._load_convert.convert`.""" from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_data_cutoff.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_data_cutoff.py index cbcb0be443..83b9e5c897 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_data_cutoff.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_data_cutoff.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_ellipsoid.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_ellipsoid.py index e90fd2d18c..3c3ce51026 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_ellipsoid.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_ellipsoid.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_ellipsoid_geometry.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_ellipsoid_geometry.py index 343a4109de..25252da835 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_ellipsoid_geometry.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_ellipsoid_geometry.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_fixup_float32_from_int32.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_fixup_float32_from_int32.py index ee2b14e06b..4d98ffdfb9 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_fixup_float32_from_int32.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_fixup_float32_from_int32.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_fixup_int32_from_uint32.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_fixup_int32_from_uint32.py index c603b6b9fb..f1144f14fc 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_fixup_int32_from_uint32.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_fixup_int32_from_uint32.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_forecast_period_coord.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_forecast_period_coord.py index 3088d95345..3c516a1bff 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_forecast_period_coord.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_forecast_period_coord.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_generating_process.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_generating_process.py index 154fc4c954..fb5942f3ff 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_generating_process.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_generating_process.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_grib2_convert.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grib2_convert.py index bf9f1b5f55..d6fec0283a 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_grib2_convert.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grib2_convert.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Test function :func:`iris.fileformats.grib._load_convert.grib2_convert`.""" from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_grid_definition_template_0_and_1.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_0_and_1.py index ccb081ab5c..0d0e4bc9ac 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_0_and_1.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_0_and_1.py @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_grid_definition_template_12.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_12.py index a6c5db6896..a9a5346344 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_12.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_12.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_grid_definition_template_30.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_30.py index 67a9449bee..515cf95896 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_30.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_30.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_grid_definition_template_40.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_40.py index bbf81e31e9..baea8537c2 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_40.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_40.py @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_grid_definition_template_4_and_5.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_4_and_5.py index d1ce34ff80..e3f04f1e8e 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_4_and_5.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_4_and_5.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_grid_definition_template_5.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_5.py index ac963c7d33..02ea8693f6 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_5.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_5.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_grid_definition_template_90.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_90.py index c72a1b9a2d..453dc71cf8 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_90.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_grid_definition_template_90.py @@ -21,7 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/unit/fileformats/grib/load_convert/test_other_time_coord.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_other_time_coord.py index 0a65ee2e6d..4b47d99c4f 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_other_time_coord.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_other_time_coord.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_product_definition_template_0.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_0.py index e502a9458b..b70c619676 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_0.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_0.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_product_definition_template_1.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_1.py index 2342e7ae54..1eedb3aac9 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_1.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_1.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_product_definition_template_31.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_31.py index 195372c4ea..c3e76cc4a8 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_31.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_31.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/fileformats/grib/load_convert/test_product_definition_template_8.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_8.py index a88031588a..99f3dd0987 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_8.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_8.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_product_definition_template_9.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_9.py index f5b85f9306..4ba8c1e68b 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_9.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_product_definition_template_9.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_projection_centre.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_projection_centre.py index 48c5ba3fd6..8426655fab 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_projection_centre.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_projection_centre.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_reference_time_coord.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_reference_time_coord.py index bad7a4f608..ee25e03d73 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_reference_time_coord.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_reference_time_coord.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -22,6 +22,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_resolution_flags.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_resolution_flags.py index 4c206de1fa..29713cffc5 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_resolution_flags.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_resolution_flags.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_scanning_mode.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_scanning_mode.py index dc34d85910..97cbe69d4e 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_scanning_mode.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_scanning_mode.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_statistical_cell_method.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_statistical_cell_method.py index 1f5e8a6365..e89f998ed8 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_statistical_cell_method.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_statistical_cell_method.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_statistical_forecast_period_coord.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_statistical_forecast_period_coord.py index 7af8215b3d..1d1058f0c9 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_statistical_forecast_period_coord.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_statistical_forecast_period_coord.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_time_range_unit.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_time_range_unit.py index 16f09e9209..056676f5b1 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_time_range_unit.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_time_range_unit.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_translate_phenomenon.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_translate_phenomenon.py index 0b7609a889..8356bd39bd 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_translate_phenomenon.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_translate_phenomenon.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_unscale.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_unscale.py index 67bc2e755e..1f219477f4 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_unscale.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_unscale.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_validity_time_coord.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_validity_time_coord.py index c673d83568..41f651290e 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_validity_time_coord.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_validity_time_coord.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_convert/test_vertical_coords.py b/lib/iris/tests/unit/fileformats/grib/load_convert/test_vertical_coords.py index e89d2bdda5..0e77561e75 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_convert/test_vertical_coords.py +++ b/lib/iris/tests/unit/fileformats/grib/load_convert/test_vertical_coords.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/load_rules/__init__.py b/lib/iris/tests/unit/fileformats/grib/load_rules/__init__.py index 4c966e6218..39a7f0e0a5 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_rules/__init__.py +++ b/lib/iris/tests/unit/fileformats/grib/load_rules/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """Unit tests for the :mod:`iris.fileformats.grib.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/grib/load_rules/test_convert.py b/lib/iris/tests/unit/fileformats/grib/load_rules/test_convert.py index 2ffaeeeceb..ea879cfa2b 100644 --- a/lib/iris/tests/unit/fileformats/grib/load_rules/test_convert.py +++ b/lib/iris/tests/unit/fileformats/grib/load_rules/test_convert.py @@ -17,6 +17,7 @@ """Unit tests for :func:`iris.fileformats.grib.load_rules.convert`.""" from __future__ import (absolute_import, division, 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/unit/fileformats/grib/message/__init__.py b/lib/iris/tests/unit/fileformats/grib/message/__init__.py index fdf6ce8d68..71b3ede0c4 100644 --- a/lib/iris/tests/unit/fileformats/grib/message/__init__.py +++ b/lib/iris/tests/unit/fileformats/grib/message/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """Unit tests for the :mod:`iris.fileformats.grib._message` 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/grib/message/test__DataProxy.py b/lib/iris/tests/unit/fileformats/grib/message/test__DataProxy.py index 50bbccd3f3..e0a9c8fa67 100644 --- a/lib/iris/tests/unit/fileformats/grib/message/test__DataProxy.py +++ b/lib/iris/tests/unit/fileformats/grib/message/test__DataProxy.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/message/test__GribMessage.py b/lib/iris/tests/unit/fileformats/grib/message/test__GribMessage.py index d477ed20b2..8fa9a3603f 100644 --- a/lib/iris/tests/unit/fileformats/grib/message/test__GribMessage.py +++ b/lib/iris/tests/unit/fileformats/grib/message/test__GribMessage.py @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/message/test__MessageLocation.py b/lib/iris/tests/unit/fileformats/grib/message/test__MessageLocation.py index e6a76a5ded..7276921ced 100644 --- a/lib/iris/tests/unit/fileformats/grib/message/test__MessageLocation.py +++ b/lib/iris/tests/unit/fileformats/grib/message/test__MessageLocation.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/message/test__RawGribMessage.py b/lib/iris/tests/unit/fileformats/grib/message/test__RawGribMessage.py index de451031ae..3ae92bd668 100644 --- a/lib/iris/tests/unit/fileformats/grib/message/test__RawGribMessage.py +++ b/lib/iris/tests/unit/fileformats/grib/message/test__RawGribMessage.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/fileformats/grib/message/test__Section.py b/lib/iris/tests/unit/fileformats/grib/message/test__Section.py index 99706dbf7a..82e9c56b8d 100644 --- a/lib/iris/tests/unit/fileformats/grib/message/test__Section.py +++ b/lib/iris/tests/unit/fileformats/grib/message/test__Section.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/__init__.py b/lib/iris/tests/unit/fileformats/grib/save_rules/__init__.py index 936988766a..99c99a2357 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/__init__.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Unit tests for the :mod:`iris.fileformats.grib.grib_save_rules` module.""" 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/grib/save_rules/test__missing_forecast_period.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test__missing_forecast_period.py index 2fdd514cd8..5bd2c47127 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test__missing_forecast_period.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test__missing_forecast_period.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test__non_missing_forecast_period.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test__non_missing_forecast_period.py index 8689d71baa..f34b0e7b04 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test__non_missing_forecast_period.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test__non_missing_forecast_period.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Unit tests for module-level 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/unit/fileformats/grib/save_rules/test_data_section.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_data_section.py index 36648456aa..cf2c5d0d67 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_data_section.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_data_section.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_fixup_float32_as_int32.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_fixup_float32_as_int32.py index 4abcf2bb56..0721ecaaa7 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_fixup_float32_as_int32.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_fixup_float32_as_int32.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_fixup_int32_as_uint32.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_fixup_int32_as_uint32.py index 716f7d7d49..01e5d7dea9 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_fixup_int32_as_uint32.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_fixup_int32_as_uint32.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_grid_definition_section.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_section.py index feddfb72a8..38225d030b 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_section.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_section.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_grid_definition_template_0.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_template_0.py index be81d18a24..d73e9b72ce 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_template_0.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_template_0.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_grid_definition_template_1.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_template_1.py index aca748f966..419cd20d77 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_template_1.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_template_1.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_grid_definition_template_12.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_template_12.py index 4583a78660..8e27fe71cb 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_template_12.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_template_12.py @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_grid_definition_template_5.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_template_5.py index ca820c1a83..e65ad41107 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_template_5.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_grid_definition_template_5.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_identification.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_identification.py index c3b13e977c..72d73a74dc 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_identification.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_identification.py @@ -17,6 +17,7 @@ """Unit tests for `iris.fileformats.grib.grib_save_rules.identification`.""" from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_product_definition_template_8.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_product_definition_template_8.py index d88ed5a01b..63d54f344d 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_product_definition_template_8.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_product_definition_template_8.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_reference_time.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_reference_time.py index 240f522383..45020fd7a8 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_reference_time.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_reference_time.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Unit tests for `iris.fileformats.grib.grib_save_rules.reference_time`.""" from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_set_fixed_surfaces.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_set_fixed_surfaces.py index faee658787..9489be5455 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_set_fixed_surfaces.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_set_fixed_surfaces.py @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_set_time_increment.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_set_time_increment.py index 51828e2926..25f7530083 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_set_time_increment.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_set_time_increment.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/save_rules/test_set_time_range.py b/lib/iris/tests/unit/fileformats/grib/save_rules/test_set_time_range.py index 307f9cde69..fd31f78507 100644 --- a/lib/iris/tests/unit/fileformats/grib/save_rules/test_set_time_range.py +++ b/lib/iris/tests/unit/fileformats/grib/save_rules/test_set_time_range.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/test_GribWrapper.py b/lib/iris/tests/unit/fileformats/grib/test_GribWrapper.py index 29fd017c36..85ef726394 100644 --- a/lib/iris/tests/unit/fileformats/grib/test_GribWrapper.py +++ b/lib/iris/tests/unit/fileformats/grib/test_GribWrapper.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/grib/test_as_messages.py b/lib/iris/tests/unit/fileformats/grib/test_as_messages.py index 530d93fe96..4cf9a96a0e 100644 --- a/lib/iris/tests/unit/fileformats/grib/test_as_messages.py +++ b/lib/iris/tests/unit/fileformats/grib/test_as_messages.py @@ -17,6 +17,7 @@ """Unit tests for the `iris.fileformats.grib.as_messages` function.""" 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/grib/test_as_pairs.py b/lib/iris/tests/unit/fileformats/grib/test_as_pairs.py index d83850d659..9d0760936f 100644 --- a/lib/iris/tests/unit/fileformats/grib/test_as_pairs.py +++ b/lib/iris/tests/unit/fileformats/grib/test_as_pairs.py @@ -17,6 +17,7 @@ """Unit tests for the `iris.fileformats.grib.as_pairs` function.""" 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/grib/test_load_cubes.py b/lib/iris/tests/unit/fileformats/grib/test_load_cubes.py index cf711663b4..a433fdc0cc 100644 --- a/lib/iris/tests/unit/fileformats/grib/test_load_cubes.py +++ b/lib/iris/tests/unit/fileformats/grib/test_load_cubes.py @@ -17,6 +17,7 @@ """Unit tests for the `iris.fileformats.grib.load_cubes` function.""" 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/grib/test_save_messages.py b/lib/iris/tests/unit/fileformats/grib/test_save_messages.py index 8d6276e748..d6907a5c56 100644 --- a/lib/iris/tests/unit/fileformats/grib/test_save_messages.py +++ b/lib/iris/tests/unit/fileformats/grib/test_save_messages.py @@ -17,6 +17,7 @@ """Unit tests for the `iris.fileformats.grib.save_messages` 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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/name_loaders/__init__.py b/lib/iris/tests/unit/fileformats/name_loaders/__init__.py index 86d3f68f14..2fbacdc89a 100644 --- a/lib/iris/tests/unit/fileformats/name_loaders/__init__.py +++ b/lib/iris/tests/unit/fileformats/name_loaders/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 842a1a6f9b..2ccb558c48 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/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 6f5ddd456b..e2d5e32ae2 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/name_loaders/test_generate_cubes.py b/lib/iris/tests/unit/fileformats/name_loaders/test_generate_cubes.py index 5a66f2b932..a0d13df43f 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 @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/unit/fileformats/netcdf/__init__.py b/lib/iris/tests/unit/fileformats/netcdf/__init__.py index 8c117d5079..64a846365f 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/__init__.py +++ b/lib/iris/tests/unit/fileformats/netcdf/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 700ee97c46..45a3cf8e19 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/test_Saver.py +++ b/lib/iris/tests/unit/fileformats/netcdf/test_Saver.py @@ -17,7 +17,7 @@ """Unit tests for the `iris.fileformats.netcdf.Saver` class.""" from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/unit/fileformats/netcdf/test__load_aux_factory.py b/lib/iris/tests/unit/fileformats/netcdf/test__load_aux_factory.py index d4196b915c..033bca2b55 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 @@ -17,6 +17,7 @@ """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 # importing anything else. 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 37f5fbfb43..8982a1a639 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/test__load_cube.py +++ b/lib/iris/tests/unit/fileformats/netcdf/test__load_cube.py @@ -17,7 +17,7 @@ """Unit tests for the `iris.fileformats.netcdf._load_cube` function.""" from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/unit/fileformats/netcdf/test_save.py b/lib/iris/tests/unit/fileformats/netcdf/test_save.py index 066ade1d1e..9068ab8cd9 100644 --- a/lib/iris/tests/unit/fileformats/netcdf/test_save.py +++ b/lib/iris/tests/unit/fileformats/netcdf/test_save.py @@ -17,6 +17,7 @@ """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 # importing anything else. 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 7f12d3ad7e..b40e3eb2ae 100644 --- a/lib/iris/tests/unit/fileformats/nimrod_load_rules/__init__.py +++ b/lib/iris/tests/unit/fileformats/nimrod_load_rules/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 e27ffb8f1c..a4801c3247 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/nimrod_load_rules/test_vertical_coord.py b/lib/iris/tests/unit/fileformats/nimrod_load_rules/test_vertical_coord.py index e3b6409616..c94c9007cb 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/pp/__init__.py b/lib/iris/tests/unit/fileformats/pp/__init__.py index 6f0e0c3570..4f4fc82340 100644 --- a/lib/iris/tests/unit/fileformats/pp/__init__.py +++ b/lib/iris/tests/unit/fileformats/pp/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 f5557b6265..f5360760ee 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_PPDataProxy.py +++ b/lib/iris/tests/unit/fileformats/pp/test_PPDataProxy.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/pp/test_PPField.py b/lib/iris/tests/unit/fileformats/pp/test_PPField.py index adf9f4bb17..0c8561f375 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_PPField.py +++ b/lib/iris/tests/unit/fileformats/pp/test_PPField.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/pp/test__LBProc.py b/lib/iris/tests/unit/fileformats/pp/test__LBProc.py index 7fd144186f..bb48564b6b 100644 --- a/lib/iris/tests/unit/fileformats/pp/test__LBProc.py +++ b/lib/iris/tests/unit/fileformats/pp/test__LBProc.py @@ -17,7 +17,7 @@ """Unit tests for :class:`iris.fileformats.pp._LBProc`.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/fileformats/pp/test__convert_constraints.py b/lib/iris/tests/unit/fileformats/pp/test__convert_constraints.py index 9cdd24f9b2..9409cd8aa1 100644 --- a/lib/iris/tests/unit/fileformats/pp/test__convert_constraints.py +++ b/lib/iris/tests/unit/fileformats/pp/test__convert_constraints.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. 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 80e8a71f89..272bb464dc 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 @@ -17,6 +17,7 @@ """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 # importing anything else. 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 1a9da08959..3b25644b62 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/pp/test__field_gen.py b/lib/iris/tests/unit/fileformats/pp/test__field_gen.py index 32e3438dab..7939b92808 100644 --- a/lib/iris/tests/unit/fileformats/pp/test__field_gen.py +++ b/lib/iris/tests/unit/fileformats/pp/test__field_gen.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 iris.tests first so that some things can be initialised before # importing anything else. 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 ddec745be6..4321d13787 100644 --- a/lib/iris/tests/unit/fileformats/pp/test__interpret_field.py +++ b/lib/iris/tests/unit/fileformats/pp/test__interpret_field.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. 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 c11e7d45d5..f506f28c7f 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_as_fields.py +++ b/lib/iris/tests/unit/fileformats/pp/test_as_fields.py @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/pp/test_as_pairs.py b/lib/iris/tests/unit/fileformats/pp/test_as_pairs.py index edf881dddd..894d8bfe45 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_as_pairs.py +++ b/lib/iris/tests/unit/fileformats/pp/test_as_pairs.py @@ -17,6 +17,7 @@ """Unit tests for the `iris.fileformats.pp.as_pairs` 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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/pp/test_load.py b/lib/iris/tests/unit/fileformats/pp/test_load.py index acb625b176..051cbc08c2 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_load.py +++ b/lib/iris/tests/unit/fileformats/pp/test_load.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/pp/test_save.py b/lib/iris/tests/unit/fileformats/pp/test_save.py index f9e5d7a720..f50d07803e 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_save.py +++ b/lib/iris/tests/unit/fileformats/pp/test_save.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 iris.tests first so that some things can be initialised before # importing anything else. 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 6387cdcf66..76b431b03d 100644 --- a/lib/iris/tests/unit/fileformats/pp/test_save_fields.py +++ b/lib/iris/tests/unit/fileformats/pp/test_save_fields.py @@ -17,6 +17,7 @@ """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 iris.tests first so that some things can be initialised before # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/pp_rules/__init__.py b/lib/iris/tests/unit/fileformats/pp_rules/__init__.py index 1e36e136b9..8a4714b9e6 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/__init__.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """Unit tests for the :mod:`iris.fileformats.pp_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_rules/test__all_other_rules.py b/lib/iris/tests/unit/fileformats/pp_rules/test__all_other_rules.py index 3dfd531aef..ee1847ee16 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test__all_other_rules.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test__all_other_rules.py @@ -17,6 +17,7 @@ """Unit tests for the `iris.fileformats.pp._all_other_rules` 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 # importing anything else. diff --git a/lib/iris/tests/unit/fileformats/pp_rules/test__collapse_degenerate_points_and_bounds.py b/lib/iris/tests/unit/fileformats/pp_rules/test__collapse_degenerate_points_and_bounds.py index 3482558b0d..f032b2b8cf 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test__collapse_degenerate_points_and_bounds.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test__collapse_degenerate_points_and_bounds.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/pp_rules/test__convert_scalar_pseudo_level_coords.py b/lib/iris/tests/unit/fileformats/pp_rules/test__convert_scalar_pseudo_level_coords.py index a8073c2475..b876574667 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test__convert_scalar_pseudo_level_coords.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test__convert_scalar_pseudo_level_coords.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/pp_rules/test__convert_scalar_realization_coords.py b/lib/iris/tests/unit/fileformats/pp_rules/test__convert_scalar_realization_coords.py index dd3f4ce5f2..acf8038b3c 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test__convert_scalar_realization_coords.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test__convert_scalar_realization_coords.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/pp_rules/test__convert_scalar_time_coords.py b/lib/iris/tests/unit/fileformats/pp_rules/test__convert_scalar_time_coords.py index 027fe0ecf0..e82f1613ec 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test__convert_scalar_time_coords.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test__convert_scalar_time_coords.py @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/pp_rules/test__convert_scalar_vertical_coords.py b/lib/iris/tests/unit/fileformats/pp_rules/test__convert_scalar_vertical_coords.py index 8048e76a9b..e7ba146dca 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test__convert_scalar_vertical_coords.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test__convert_scalar_vertical_coords.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/pp_rules/test__convert_time_coords.py b/lib/iris/tests/unit/fileformats/pp_rules/test__convert_time_coords.py index 386c22fa65..7684e10069 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test__convert_time_coords.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test__convert_time_coords.py @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/pp_rules/test__convert_vertical_coords.py b/lib/iris/tests/unit/fileformats/pp_rules/test__convert_vertical_coords.py index 2233e6680c..22fbc9b152 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test__convert_vertical_coords.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test__convert_vertical_coords.py @@ -21,7 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/fileformats/pp_rules/test__dim_or_aux.py b/lib/iris/tests/unit/fileformats/pp_rules/test__dim_or_aux.py index 1cefa795bc..7cbe05d620 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test__dim_or_aux.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test__dim_or_aux.py @@ -17,7 +17,7 @@ """Unit tests for :func:`iris.fileformats.pp_rules._dim_or_aux`.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/fileformats/pp_rules/test__model_level_number.py b/lib/iris/tests/unit/fileformats/pp_rules/test__model_level_number.py index 30fc8899b1..37de979c94 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test__model_level_number.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test__model_level_number.py @@ -17,7 +17,7 @@ """Unit tests for :func:`iris.fileformats.pp_rules._model_level_number`.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/fileformats/pp_rules/test__reduced_points_and_bounds.py b/lib/iris/tests/unit/fileformats/pp_rules/test__reduced_points_and_bounds.py index 95b9c585a6..a2c598afce 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test__reduced_points_and_bounds.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test__reduced_points_and_bounds.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/pp_rules/test__reshape_vector_args.py b/lib/iris/tests/unit/fileformats/pp_rules/test__reshape_vector_args.py index 6ecd0da910..8f81135490 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test__reshape_vector_args.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test__reshape_vector_args.py @@ -21,7 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/unit/fileformats/pp_rules/test_convert.py b/lib/iris/tests/unit/fileformats/pp_rules/test_convert.py index 9a7b1b0b84..136dcefe75 100644 --- a/lib/iris/tests/unit/fileformats/pp_rules/test_convert.py +++ b/lib/iris/tests/unit/fileformats/pp_rules/test_convert.py @@ -17,7 +17,7 @@ """Unit tests for :func:`iris.fileformats.pp_rules.convert`.""" from __future__ import (absolute_import, division, print_function) -from six.moves import filter +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/unit/fileformats/pyke_rules/__init__.py b/lib/iris/tests/unit/fileformats/pyke_rules/__init__.py index ad23ff4ee8..d2c5491557 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/__init__.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 f84d911ad5..41e23dca1c 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -20,3 +20,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 423454d283..34e18a1b25 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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__parse_cell_methods.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test__parse_cell_methods.py index ad5755b937..7191ef6995 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test__parse_cell_methods.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test__parse_cell_methods.py @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/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 7c2ef5457b..ec5a02f16f 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 @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/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 8f2e2257c6..056e7612c3 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/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 ffba1ea540..c45f51ea48 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 @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/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 ccab6b8071..83a5a7d9fb 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 @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/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 7d910cdc07..64f6896b0c 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 @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/fileformats/rules/__init__.py b/lib/iris/tests/unit/fileformats/rules/__init__.py index b7a3ac4877..0b2f03add2 100644 --- a/lib/iris/tests/unit/fileformats/rules/__init__.py +++ b/lib/iris/tests/unit/fileformats/rules/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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__make_cube.py b/lib/iris/tests/unit/fileformats/rules/test__make_cube.py index 6a8786cea4..7759809f97 100644 --- a/lib/iris/tests/unit/fileformats/rules/test__make_cube.py +++ b/lib/iris/tests/unit/fileformats/rules/test__make_cube.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. 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 b3e19448f1..b1e8bb1621 100644 --- a/lib/iris/tests/unit/fileformats/structured_array_identification/__init__.py +++ b/lib/iris/tests/unit/fileformats/structured_array_identification/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,3 +21,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 b9c534e304..1a969349b0 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 @@ -21,7 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/fileformats/structured_array_identification/test_GroupStructure.py b/lib/iris/tests/unit/fileformats/structured_array_identification/test_GroupStructure.py index f5aed5c643..e0ec0f54f4 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 @@ -21,7 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/unit/fileformats/um/__init__.py b/lib/iris/tests/unit/fileformats/um/__init__.py index 055f477f81..bdff68c328 100644 --- a/lib/iris/tests/unit/fileformats/um/__init__.py +++ b/lib/iris/tests/unit/fileformats/um/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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_structured_fields/__init__.py b/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/__init__.py index 0f2dfb7ecd..6da232322c 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,3 +21,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_FieldCollation.py b/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_FieldCollation.py index 70382e450c..67347bce65 100644 --- a/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_FieldCollation.py +++ b/lib/iris/tests/unit/fileformats/um/fast_load_structured_fields/test_FieldCollation.py @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/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 535cdc96fb..57a5f1904e 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 @@ -21,7 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range, zip +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/unit/fileformats/um/optimal_array_structuring/__init__.py b/lib/iris/tests/unit/fileformats/um/optimal_array_structuring/__init__.py index 803598656e..e2bd3f6190 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -21,3 +21,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 1fd792a893..8558bb763a 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 @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, 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/unit/io/__init__.py b/lib/iris/tests/unit/io/__init__.py index 38dcc7bc96..200e0a3189 100644 --- a/lib/iris/tests/unit/io/__init__.py +++ b/lib/iris/tests/unit/io/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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_run_callback.py b/lib/iris/tests/unit/io/test_run_callback.py index f5f80ee644..10c4483088 100644 --- a/lib/iris/tests/unit/io/test_run_callback.py +++ b/lib/iris/tests/unit/io/test_run_callback.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/merge/__init__.py b/lib/iris/tests/unit/merge/__init__.py index 065eb77d49..9889079c83 100644 --- a/lib/iris/tests/unit/merge/__init__.py +++ b/lib/iris/tests/unit/merge/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 1d2121463f..441fbc04b6 100644 --- a/lib/iris/tests/unit/merge/test_ProtoCube.py +++ b/lib/iris/tests/unit/merge/test_ProtoCube.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 iris.tests first so that some things can be initialised before # importing anything else. diff --git a/lib/iris/tests/unit/merge/test__CubeSignature.py b/lib/iris/tests/unit/merge/test__CubeSignature.py index e2e19c0fdf..c78277edca 100644 --- a/lib/iris/tests/unit/merge/test__CubeSignature.py +++ b/lib/iris/tests/unit/merge/test__CubeSignature.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Unit tests for the `iris._merge._CubeSignature` 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 # importing anything else. diff --git a/lib/iris/tests/unit/plot/__init__.py b/lib/iris/tests/unit/plot/__init__.py index b5749aca12..e1a27583f6 100644 --- a/lib/iris/tests/unit/plot/__init__.py +++ b/lib/iris/tests/unit/plot/__init__.py @@ -17,7 +17,7 @@ """Unit tests for the :mod:`iris.plot` module.""" from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/unit/plot/test_contour.py b/lib/iris/tests/unit/plot/test_contour.py index 739651692d..6694f987d6 100644 --- a/lib/iris/tests/unit/plot/test_contour.py +++ b/lib/iris/tests/unit/plot/test_contour.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/plot/test_contourf.py b/lib/iris/tests/unit/plot/test_contourf.py index f1e74e2bfb..2171088d43 100644 --- a/lib/iris/tests/unit/plot/test_contourf.py +++ b/lib/iris/tests/unit/plot/test_contourf.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/plot/test_outline.py b/lib/iris/tests/unit/plot/test_outline.py index a9b923449a..7955f789c0 100644 --- a/lib/iris/tests/unit/plot/test_outline.py +++ b/lib/iris/tests/unit/plot/test_outline.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/plot/test_pcolor.py b/lib/iris/tests/unit/plot/test_pcolor.py index 5c7055f9c5..959a61bf9c 100644 --- a/lib/iris/tests/unit/plot/test_pcolor.py +++ b/lib/iris/tests/unit/plot/test_pcolor.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/plot/test_pcolormesh.py b/lib/iris/tests/unit/plot/test_pcolormesh.py index a5f74c46f8..121ca9e867 100644 --- a/lib/iris/tests/unit/plot/test_pcolormesh.py +++ b/lib/iris/tests/unit/plot/test_pcolormesh.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/plot/test_plot.py b/lib/iris/tests/unit/plot/test_plot.py index afafffa9b9..0b563f4d09 100644 --- a/lib/iris/tests/unit/plot/test_plot.py +++ b/lib/iris/tests/unit/plot/test_plot.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/plot/test_points.py b/lib/iris/tests/unit/plot/test_points.py index 3d67984ee5..e9bdb27929 100644 --- a/lib/iris/tests/unit/plot/test_points.py +++ b/lib/iris/tests/unit/plot/test_points.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/plot/test_scatter.py b/lib/iris/tests/unit/plot/test_scatter.py index 3fee61712d..3b0d9d9cc4 100644 --- a/lib/iris/tests/unit/plot/test_scatter.py +++ b/lib/iris/tests/unit/plot/test_scatter.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/quickplot/__init__.py b/lib/iris/tests/unit/quickplot/__init__.py index b64ab1b4e2..697881cf4d 100644 --- a/lib/iris/tests/unit/quickplot/__init__.py +++ b/lib/iris/tests/unit/quickplot/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 7c522d1c0e..148d31f7df 100644 --- a/lib/iris/tests/unit/quickplot/test_contour.py +++ b/lib/iris/tests/unit/quickplot/test_contour.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/quickplot/test_contourf.py b/lib/iris/tests/unit/quickplot/test_contourf.py index d881b7e21a..0cacda1185 100644 --- a/lib/iris/tests/unit/quickplot/test_contourf.py +++ b/lib/iris/tests/unit/quickplot/test_contourf.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/quickplot/test_outline.py b/lib/iris/tests/unit/quickplot/test_outline.py index a21ef02a74..7901add5ed 100644 --- a/lib/iris/tests/unit/quickplot/test_outline.py +++ b/lib/iris/tests/unit/quickplot/test_outline.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/quickplot/test_pcolor.py b/lib/iris/tests/unit/quickplot/test_pcolor.py index 7dfe85dcaa..bed9c26326 100644 --- a/lib/iris/tests/unit/quickplot/test_pcolor.py +++ b/lib/iris/tests/unit/quickplot/test_pcolor.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/quickplot/test_pcolormesh.py b/lib/iris/tests/unit/quickplot/test_pcolormesh.py index c0e3fc746c..845dd479c5 100644 --- a/lib/iris/tests/unit/quickplot/test_pcolormesh.py +++ b/lib/iris/tests/unit/quickplot/test_pcolormesh.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/quickplot/test_plot.py b/lib/iris/tests/unit/quickplot/test_plot.py index 079dd21fbc..cca87c133b 100644 --- a/lib/iris/tests/unit/quickplot/test_plot.py +++ b/lib/iris/tests/unit/quickplot/test_plot.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/quickplot/test_points.py b/lib/iris/tests/unit/quickplot/test_points.py index 51ff6980a3..4fee0ec6ad 100644 --- a/lib/iris/tests/unit/quickplot/test_points.py +++ b/lib/iris/tests/unit/quickplot/test_points.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/quickplot/test_scatter.py b/lib/iris/tests/unit/quickplot/test_scatter.py index 51438c564b..5879e0631c 100644 --- a/lib/iris/tests/unit/quickplot/test_scatter.py +++ b/lib/iris/tests/unit/quickplot/test_scatter.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/test_Future.py b/lib/iris/tests/unit/test_Future.py index 8701ff0a46..4ab559e2fa 100644 --- a/lib/iris/tests/unit/test_Future.py +++ b/lib/iris/tests/unit/test_Future.py @@ -17,6 +17,7 @@ """Unit tests for the `iris.Future` 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 # importing anything else. diff --git a/lib/iris/tests/unit/tests/__init__.py b/lib/iris/tests/unit/tests/__init__.py index db80f28a0a..de508654d4 100644 --- a/lib/iris/tests/unit/tests/__init__.py +++ b/lib/iris/tests/unit/tests/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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 3ede5dd29f..37e853a7b0 100644 --- a/lib/iris/tests/unit/tests/test_IrisTest.py +++ b/lib/iris/tests/unit/tests/test_IrisTest.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 iris tests first so that some things can be initialised before # importing anything else diff --git a/lib/iris/tests/unit/time/test_PartialDateTime.py b/lib/iris/tests/unit/time/test_PartialDateTime.py index 3c6431ee81..d2c69afe9f 100644 --- a/lib/iris/tests/unit/time/test_PartialDateTime.py +++ b/lib/iris/tests/unit/time/test_PartialDateTime.py @@ -17,7 +17,7 @@ """Unit tests for the `iris.time.PartialDateTime` class.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/unit/__init__.py b/lib/iris/tests/unit/unit/__init__.py index ba77229dff..8758ef9c1a 100644 --- a/lib/iris/tests/unit/unit/__init__.py +++ b/lib/iris/tests/unit/unit/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """Unit tests for the :mod:`iris.unit` 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/unit/test_Unit.py b/lib/iris/tests/unit/unit/test_Unit.py index d7db3004b9..bbbbb037e2 100644 --- a/lib/iris/tests/unit/unit/test_Unit.py +++ b/lib/iris/tests/unit/unit/test_Unit.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Unit tests for the `iris.unit.Unit` 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 # importing anything else diff --git a/lib/iris/tests/unit/unit/test_suppress_unit_warnings.py b/lib/iris/tests/unit/unit/test_suppress_unit_warnings.py index 0f3a68fff9..fc55b9cbc6 100644 --- a/lib/iris/tests/unit/unit/test_suppress_unit_warnings.py +++ b/lib/iris/tests/unit/unit/test_suppress_unit_warnings.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """Test function :func:`iris.unit.suppress_unit_warnings`.""" from __future__ import (absolute_import, division, 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/unit/util/__init__.py b/lib/iris/tests/unit/util/__init__.py index d77f52de49..4e39e45ea8 100644 --- a/lib/iris/tests/unit/util/__init__.py +++ b/lib/iris/tests/unit/util/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,3 +17,4 @@ """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_array_equal.py b/lib/iris/tests/unit/util/test_array_equal.py index c91adcce7e..31fd9dd842 100644 --- a/lib/iris/tests/unit/util/test_array_equal.py +++ b/lib/iris/tests/unit/util/test_array_equal.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else 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 b303a3d54b..6fe2fccf20 100644 --- a/lib/iris/tests/unit/util/test_broadcast_to_shape.py +++ b/lib/iris/tests/unit/util/test_broadcast_to_shape.py @@ -17,7 +17,7 @@ """Test function :func:`iris.util.broadcast_to_shape`.""" from __future__ import (absolute_import, division, print_function) -from six.moves import range +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/unit/util/test_column_slices_generator.py b/lib/iris/tests/unit/util/test_column_slices_generator.py index bfcea40378..1bf338aef9 100644 --- a/lib/iris/tests/unit/util/test_column_slices_generator.py +++ b/lib/iris/tests/unit/util/test_column_slices_generator.py @@ -17,6 +17,7 @@ """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 # importing anything else 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 71c3f0c061..02e06c3aa7 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 @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/util/test_describe_diff.py b/lib/iris/tests/unit/util/test_describe_diff.py index 0edfb9d519..c9e3df55cc 100644 --- a/lib/iris/tests/unit/util/test_describe_diff.py +++ b/lib/iris/tests/unit/util/test_describe_diff.py @@ -17,6 +17,7 @@ """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 iris tests first so that some things can be initialised before # importing anything else 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 cfb635e3fa..c0bde345c2 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 @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ from __future__ import (absolute_import, division, 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/unit/util/test_new_axis.py b/lib/iris/tests/unit/util/test_new_axis.py index 6634ed6a8f..fbf34e24c4 100644 --- a/lib/iris/tests/unit/util/test_new_axis.py +++ b/lib/iris/tests/unit/util/test_new_axis.py @@ -17,7 +17,7 @@ """Test function :func:`iris.util.new_axis`.""" from __future__ import (absolute_import, division, print_function) -from six.moves import zip +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/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 715201365f..7b72bbf6a9 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 @@ -17,6 +17,7 @@ """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 # importing anything else. diff --git a/lib/iris/tests/unit/util/test_rolling_window.py b/lib/iris/tests/unit/util/test_rolling_window.py index 095e3805b9..cee5fad7a9 100644 --- a/lib/iris/tests/unit/util/test_rolling_window.py +++ b/lib/iris/tests/unit/util/test_rolling_window.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else diff --git a/lib/iris/tests/unit/util/test_squeeze.py b/lib/iris/tests/unit/util/test_squeeze.py index f278bcc5ce..a1bc8d271e 100644 --- a/lib/iris/tests/unit/util/test_squeeze.py +++ b/lib/iris/tests/unit/util/test_squeeze.py @@ -17,6 +17,7 @@ """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 # importing anything else. 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 1ada452bc5..c814d38320 100644 --- a/lib/iris/tests/unit/util/test_unify_time_units.py +++ b/lib/iris/tests/unit/util/test_unify_time_units.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014, Met Office +# (C) British Crown Copyright 2014 - 2015, Met Office # # This file is part of Iris. # @@ -17,6 +17,7 @@ """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 # importing anything else diff --git a/lib/iris/time.py b/lib/iris/time.py index befb993443..b57f7bb6a3 100644 --- a/lib/iris/time.py +++ b/lib/iris/time.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -20,6 +20,7 @@ """ 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/unit.py b/lib/iris/unit.py index 4d492f53a1..80fe64425f 100644 --- a/lib/iris/unit.py +++ b/lib/iris/unit.py @@ -26,7 +26,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +from six.moves import (filter, input, map, range, zip) # noqa from contextlib import contextmanager import copy diff --git a/lib/iris/util.py b/lib/iris/util.py index 5115df4d2a..b22a696b79 100644 --- a/lib/iris/util.py +++ b/lib/iris/util.py @@ -20,7 +20,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import filter, range, zip +from six.moves import (filter, input, map, range, zip) # noqa import abc import collections diff --git a/tools/gen_helpers.py b/tools/gen_helpers.py index 01901ba225..e4d7687f15 100644 --- a/tools/gen_helpers.py +++ b/tools/gen_helpers.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa from datetime import datetime import os diff --git a/tools/gen_stash_refs.py b/tools/gen_stash_refs.py index 7fd726815c..644d6ca343 100644 --- a/tools/gen_stash_refs.py +++ b/tools/gen_stash_refs.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2014, Met Office +# (C) British Crown Copyright 2013 - 2015, Met Office # # This file is part of Iris. # @@ -16,6 +16,7 @@ # along with Iris. If not, see . from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import json import urllib diff --git a/tools/gen_translations.py b/tools/gen_translations.py index 9c0820b110..857728e43a 100644 --- a/tools/gen_translations.py +++ b/tools/gen_translations.py @@ -21,6 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa from datetime import datetime import os.path @@ -56,6 +57,7 @@ {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 e72c02ec31..675bd77a5c 100644 --- a/tools/generate_std_names.py +++ b/tools/generate_std_names.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -29,6 +29,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa import argparse import pprint @@ -36,7 +37,7 @@ STD_VALUES_FILE_TEMPLATE = ''' -# (C) British Crown Copyright 2010 - 2014, Met Office +# (C) British Crown Copyright 2010 - 2015, Met Office # # This file is part of Iris. # @@ -72,6 +73,7 @@ """ from __future__ import (absolute_import, division, print_function) +from six.moves import (filter, input, map, range, zip) # noqa STD_NAMES = '''.lstrip() diff --git a/tools/translator/__init__.py b/tools/translator/__init__.py index 7b80a7917a..c59698cf38 100644 --- a/tools/translator/__init__.py +++ b/tools/translator/__init__.py @@ -21,7 +21,7 @@ """ from __future__ import (absolute_import, division, print_function) -from six.moves import range +from six.moves import (filter, input, map, range, zip) # noqa from abc import ABCMeta, abstractmethod, abstractproperty from collections import deque, namedtuple From 7f4d1b53870a37f82b237ffe7e68d50cf8ff5ada Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 1 Jul 2015 02:57:10 -0400 Subject: [PATCH 2/2] Add a test that six builtins were imported. --- lib/iris/tests/test_coding_standards.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/iris/tests/test_coding_standards.py b/lib/iris/tests/test_coding_standards.py index 22609ae2b8..aa40f7e3ba 100644 --- a/lib/iris/tests/test_coding_standards.py +++ b/lib/iris/tests/test_coding_standards.py @@ -379,6 +379,10 @@ class TestFutureImports(unittest.TestCase): 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. @@ -407,9 +411,15 @@ def test_future_imports(self): '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 ValueError('There were __future__ import check failures. ' - 'See stdout.') + raise AssertionError('There were Python 3 compatibility import ' + 'check failures. See stdout.') if __name__ == '__main__':