Skip to content

Remove python 2 code #3513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bjlittle merged 8 commits into from
Nov 7, 2019
Merged

Remove python 2 code #3513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c01d47a
remove __future__ imports
stephenworsley Nov 1, 2019
5259e00
remove __future__/six testing
stephenworsley Nov 1, 2019
d9c24dc
remove additional __future__ references
stephenworsley Nov 4, 2019
349a7fc
Merge pull request #3505 from stephenworsley/less_future
trexfeathers Nov 4, 2019
f081199
Remove unnecessary super arguments (#3506)
stephenworsley Nov 4, 2019
a3519aa
remove python 2 specific code (#3507)
stephenworsley Nov 4, 2019
65709d3
Remove six (#3509)
stephenworsley Nov 5, 2019
960ed9b
Simplify class definitions, remove (object) (#3511)
stephenworsley Nov 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .stickler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
linters:
flake8:
python: 3

files:
ignore:
Expand Down
2 changes: 0 additions & 2 deletions docs/iris/example_code/Meteorology/COP_maps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
doi:10.1029/2009EO210001.

"""
from six.moves import zip

import os.path
import matplotlib.pyplot as plt
import numpy as np
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,3 @@
# This file is part of Iris and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa
3 changes: 0 additions & 3 deletions docs/iris/example_tests/extest_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@

"""

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

import contextlib
import os.path
import warnings
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_COP_1d_plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_COP_maps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_SOI_filtering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_TEC.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_anomaly_log_colouring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_atlantic_profiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_coriolis_plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.

Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_cross_section.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_custom_aggregation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_custom_file_loading.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_deriving_phenomena.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_global_map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_hovmoller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_inset_plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.

Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_lagged_ensemble.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_lineplot_with_legend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_load_nemo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_orca_projection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_polar_stereo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_polynomial_fit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_projections_and_annotations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_rotated_pole_mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/example_tests/test_wind_speed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# Import Iris tests first so that some things can be initialised before
# importing anything else.
import iris.tests as tests
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

# -*- coding: utf-8 -*-
#
# Iris documentation build configuration file, created by
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/src/developers_guide/documenting/docstrings_attribute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class ExampleClass(object):
class ExampleClass:
"""
Class Summary

Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/developers_guide/gitwash_dumper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
#!/usr/bin/env python
''' Checkout gitwash repo into directory and do search replace on name '''

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

import os
from os.path import join as pjoin
import shutil
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/sphinxext/auto_label_figures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

import os
from docutils import nodes

Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/sphinxext/custom_class_autodoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

from sphinx.ext import autodoc
from sphinx.ext.autodoc import *
from sphinx.util import force_decode
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/sphinxext/custom_data_autodoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

from sphinx.ext.autodoc import DataDocumenter, ModuleLevelDocumenter
try:
# Use 'object_description' in place of the former 'safe_repr' function.
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/sphinxext/gen_example_directory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
Generate the rst files for the examples
'''

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

import os
import re
import shutil
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/sphinxext/gen_gallery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
Generate a thumbnail gallery of examples.
'''

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

import os
import glob
import re
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/sphinxext/generate_package_rst.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

import os
import sys
import re
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/userguide/plotting_examples/1d_quickplot_simple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

import matplotlib.pyplot as plt

import iris
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/userguide/plotting_examples/1d_simple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

import matplotlib.pyplot as plt

import iris
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/userguide/plotting_examples/1d_with_legend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

import matplotlib.pyplot as plt

import iris
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/userguide/plotting_examples/brewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

import matplotlib.pyplot as plt
import numpy as np

Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/userguide/plotting_examples/cube_blockplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

import matplotlib.pyplot as plt

import iris
Expand Down
3 changes: 0 additions & 3 deletions docs/iris/src/userguide/plotting_examples/cube_brewer_cite_contourf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

from __future__ import (absolute_import, division, print_function)
from six.moves import (filter, input, map, range, zip) # noqa

import matplotlib.pyplot as plt

import iris
Expand Down
Loading