Skip to content

Finish removing future imports. #11142

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.

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
merged 1 commit into from
Apr 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion doc/sphinxext/math_symbol_table.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
symbols = [
["Lower-case Greek",
6,
Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@
"""
# NOTE: This file must remain Python 2 compatible for the foreseeable future,
# to ensure that we error out properly for existing editable installs.
from __future__ import absolute_import, division, print_function

import six

Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/_cm.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
with the purpose and type of your colormap if you add data for one here.
"""

from __future__ import (absolute_import, division, print_function,
unicode_literals)

import numpy as np

_binary_data = {
Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/_constrained_layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@
# Todo: AnchoredOffsetbox connected to gridspecs or axes. This would
# be more general way to add extra-axes annotations.

from __future__ import (absolute_import, division, print_function,
unicode_literals)

import numpy as np
import logging
import warnings
Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/_layoutbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@

"""

from __future__ import (absolute_import, division, print_function,
unicode_literals)

import itertools
import kiwisolver as kiwi
import logging
Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/artist.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

import six

from collections import OrderedDict, namedtuple
Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/axes/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

from ._subplots import *
from ._axes import *
3 changes: 0 additions & 3 deletions lib/matplotlib/backends/backend_agg.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
* integrate screen dpi w/ ppi and text

"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)

import six

import threading
Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/backends/backend_cairo.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
cairocffi, or (Python 2 only) on pycairo.
"""

from __future__ import (absolute_import, division, print_function,
unicode_literals)

import six

import gzip
Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/backends/backend_macosx.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

import os

from matplotlib._pylab_helpers import Gcf
Expand Down
4 changes: 0 additions & 4 deletions lib/matplotlib/backends/backend_ps.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
"""
A PostScript backend, which can produce both PostScript .ps and .eps
"""

from __future__ import (absolute_import, division, print_function,
unicode_literals)

import six
from six.moves import StringIO

Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/backends/backend_svg.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

from collections import OrderedDict

import six
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/backends/qt_editor/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
1 change: 0 additions & 1 deletion lib/matplotlib/backends/web_backend/nbagg_uat.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
},
"outputs": [],
"source": [
"from __future__ import print_function\n",
"from imp import reload"
]
},
Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/blocking_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
Note: Subclass of BlockingMouseInput. Used by clabel
"""

from __future__ import (absolute_import, division, print_function,
unicode_literals)

import six
import matplotlib.lines as mlines

Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/lines.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
"""

# TODO: expose cap and join style attrs
from __future__ import absolute_import, division, print_function

import six

from numbers import Number
Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/mlab.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@

"""

from __future__ import (absolute_import, division, print_function,
unicode_literals)

import six
from six.moves import map, zip

Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/patches.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import six
from six.moves import map, zip

Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/rcsetup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
parameter set listed here should also be visited to the
:file:`matplotlibrc.template` in matplotlib's root source directory.
"""
from __future__ import absolute_import, division, print_function

import six

from collections import Iterable, Mapping
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/sphinxext/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)
3 changes: 0 additions & 3 deletions lib/matplotlib/sphinxext/plot_directive.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,6 @@
plot_template
Provide a customized template for preparing restructured text.
"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)

import six
from six.moves import xrange

Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/sphinxext/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

from matplotlib.testing.conftest import (mpl_test_settings,
mpl_image_comparison_parameters,
pytest_configure, pytest_unconfigure)
3 changes: 0 additions & 3 deletions lib/matplotlib/stackplot.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
(http://stackoverflow.com/users/66549/doug)

"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)

import numpy as np

__all__ = ['stackplot']
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/style/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
from __future__ import absolute_import

from .core import use, context, available, library, reload_library
3 changes: 0 additions & 3 deletions lib/matplotlib/testing/conftest.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

import pytest

import matplotlib
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import six

import difflib
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

from matplotlib.testing.conftest import (mpl_test_settings,
mpl_image_comparison_parameters,
pytest_configure, pytest_unconfigure,
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_agg.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import io

import numpy as np
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_arrow_patches.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import matplotlib.pyplot as plt
from matplotlib.testing.decorators import image_comparison
import matplotlib.patches as mpatches
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_axes.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import six
from itertools import chain, product
from distutils.version import LooseVersion
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_backend_svg.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import six

import numpy as np
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_basic.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import six
import sys

Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_bbox_tight.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import numpy as np

from matplotlib.testing.decorators import image_comparison
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_category.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
"""Catch all for categorical functions"""
from __future__ import absolute_import, division, print_function

import pytest
import numpy as np

Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/tests/test_cbook.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import absolute_import, division, print_function
import itertools
import pickle
from weakref import ref
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_collections.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
"""
Tests specific to the collections module.
"""
from __future__ import absolute_import, division, print_function

import io

import numpy as np
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_colorbar.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import numpy as np
import pytest

Expand Down
4 changes: 0 additions & 4 deletions lib/matplotlib/tests/test_constrainedlayout.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

import six
import warnings


import numpy as np
import pytest

Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_container.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import six
import matplotlib.pyplot as plt

Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_contour.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import datetime

import numpy as np
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_figure.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import sys
import warnings

Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_lines.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
"""
Tests specific to the lines module.
"""
from __future__ import absolute_import, division, print_function

import itertools
import matplotlib.lines as mlines
import pytest
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_mathtext.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import six

import io
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_mlab.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import six

import tempfile
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_offsetbox.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import pytest
from matplotlib.testing.decorators import image_comparison
import matplotlib.pyplot as plt
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_patches.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
"""
Tests specific to the patches module.
"""
from __future__ import absolute_import, division, print_function

import six

import numpy as np
Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/tests/test_path.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import absolute_import, division, print_function
import copy

import numpy as np
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_patheffects.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import numpy as np
import pytest

Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_pickle.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

from six.moves import cPickle as pickle
from six.moves import range

Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_png.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import six
from six import BytesIO
import glob
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_preprocess_data.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import (absolute_import, division, print_function)

import re

import numpy as np
Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/tests/test_quiver.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
import warnings
import numpy as np
import pytest
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_sankey.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

from matplotlib.sankey import Sankey


Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_scale.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import print_function, unicode_literals

from matplotlib.testing.decorators import image_comparison
import matplotlib.pyplot as plt
from matplotlib.scale import Log10Transform, InvertedLog10Transform
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_skew.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
"""
Testing that skewed axes properly work
"""
from __future__ import absolute_import, division, print_function

import itertools

import matplotlib.pyplot as plt
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_spines.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, division, print_function

import numpy as np

import matplotlib.pyplot as plt
Expand Down
Loading