Skip to content

Commit 545ffc0

Browse files
jklymakjklymak
authored
Merge pull request matplotlib#11142 from anntzer/thefutureisnow
Finish removing future imports.
2 parents 3ba79fb + 81e8154 commit 545ffc0

File tree

131 files changed

+0
-318
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+0
-318
lines changed

‎doc/sphinxext/math_symbol_table.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__ import print_function
21
symbols = [
32
["Lower-case Greek",
43
6,

‎lib/matplotlib/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
"""
102102
# NOTE: This file must remain Python 2 compatible for the foreseeable future,
103103
# to ensure that we error out properly for existing editable installs.
104-
from __future__ import absolute_import, division, print_function
105104

106105
import six
107106

‎lib/matplotlib/_cm.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
with the purpose and type of your colormap if you add data for one here.
77
"""
88

9-
from __future__ import (absolute_import, division, print_function,
10-
unicode_literals)
11-
129
import numpy as np
1310

1411
_binary_data = {

‎lib/matplotlib/_constrained_layout.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
# Todo: AnchoredOffsetbox connected to gridspecs or axes. This would
4646
# be more general way to add extra-axes annotations.
4747

48-
from __future__ import (absolute_import, division, print_function,
49-
unicode_literals)
50-
5148
import numpy as np
5249
import logging
5350
import warnings

‎lib/matplotlib/_layoutbox.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
1616
"""
1717

18-
from __future__ import (absolute_import, division, print_function,
19-
unicode_literals)
20-
2118
import itertools
2219
import kiwisolver as kiwi
2320
import logging

‎lib/matplotlib/artist.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
from __future__ import (absolute_import, division, print_function,
2-
unicode_literals)
3-
41
import six
52

63
from collections import OrderedDict, namedtuple

‎lib/matplotlib/axes/__init__.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
from __future__ import (absolute_import, division, print_function,
2-
unicode_literals)
3-
41
from ._subplots import *
52
from ._axes import *

‎lib/matplotlib/backends/backend_agg.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
* integrate screen dpi w/ ppi and text
2020
2121
"""
22-
from __future__ import (absolute_import, division, print_function,
23-
unicode_literals)
24-
2522
import six
2623

2724
import threading

‎lib/matplotlib/backends/backend_cairo.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
cairocffi, or (Python 2 only) on pycairo.
88
"""
99

10-
from __future__ import (absolute_import, division, print_function,
11-
unicode_literals)
12-
1310
import six
1411

1512
import gzip

‎lib/matplotlib/backends/backend_macosx.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
from __future__ import (absolute_import, division, print_function,
2-
unicode_literals)
3-
41
import os
52

63
from matplotlib._pylab_helpers import Gcf

‎lib/matplotlib/backends/backend_ps.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
"""
22
A PostScript backend, which can produce both PostScript .ps and .eps
33
"""
4-
5-
from __future__ import (absolute_import, division, print_function,
6-
unicode_literals)
7-
84
import six
95
from six.moves import StringIO
106

‎lib/matplotlib/backends/backend_svg.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
from __future__ import (absolute_import, division, print_function,
2-
unicode_literals)
3-
41
from collections import OrderedDict
52

63
import six

‎lib/matplotlib/backends/qt_editor/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
from __future__ import (absolute_import, division, print_function,
2-
unicode_literals)

‎lib/matplotlib/backends/web_backend/nbagg_uat.ipynb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
},
99
"outputs": [],
1010
"source": [
11-
"from __future__ import print_function\n",
1211
"from imp import reload"
1312
]
1413
},

‎lib/matplotlib/blocking_input.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
Note: Subclass of BlockingMouseInput. Used by clabel
2323
"""
2424

25-
from __future__ import (absolute_import, division, print_function,
26-
unicode_literals)
27-
2825
import six
2926
import matplotlib.lines as mlines
3027

‎lib/matplotlib/lines.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"""
55

66
# TODO: expose cap and join style attrs
7-
from __future__ import absolute_import, division, print_function
8-
97
import six
108

119
from numbers import Number

‎lib/matplotlib/mlab.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,6 @@
154154
155155
"""
156156

157-
from __future__ import (absolute_import, division, print_function,
158-
unicode_literals)
159-
160157
import six
161158
from six.moves import map, zip
162159

‎lib/matplotlib/patches.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import six
42
from six.moves import map, zip
53

‎lib/matplotlib/rcsetup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
parameter set listed here should also be visited to the
1414
:file:`matplotlibrc.template` in matplotlib's root source directory.
1515
"""
16-
from __future__ import absolute_import, division, print_function
17-
1816
import six
1917

2018
from collections import Iterable, Mapping

‎lib/matplotlib/sphinxext/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
from __future__ import (absolute_import, division, print_function,
2-
unicode_literals)

‎lib/matplotlib/sphinxext/plot_directive.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,6 @@
134134
plot_template
135135
Provide a customized template for preparing restructured text.
136136
"""
137-
from __future__ import (absolute_import, division, print_function,
138-
unicode_literals)
139-
140137
import six
141138
from six.moves import xrange
142139

‎lib/matplotlib/sphinxext/tests/conftest.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
from __future__ import (absolute_import, division, print_function,
2-
unicode_literals)
3-
41
from matplotlib.testing.conftest import (mpl_test_settings,
52
mpl_image_comparison_parameters,
63
pytest_configure, pytest_unconfigure)

‎lib/matplotlib/stackplot.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
(http://stackoverflow.com/users/66549/doug)
77
88
"""
9-
from __future__ import (absolute_import, division, print_function,
10-
unicode_literals)
11-
129
import numpy as np
1310

1411
__all__ = ['stackplot']

‎lib/matplotlib/style/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
from __future__ import absolute_import
2-
31
from .core import use, context, available, library, reload_library

‎lib/matplotlib/testing/conftest.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
from __future__ import (absolute_import, division, print_function,
2-
unicode_literals)
3-
41
import pytest
52

63
import matplotlib

‎lib/matplotlib/tests/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import six
42

53
import difflib

‎lib/matplotlib/tests/conftest.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
from matplotlib.testing.conftest import (mpl_test_settings,
42
mpl_image_comparison_parameters,
53
pytest_configure, pytest_unconfigure,

‎lib/matplotlib/tests/test_agg.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import io
42

53
import numpy as np

‎lib/matplotlib/tests/test_arrow_patches.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import matplotlib.pyplot as plt
42
from matplotlib.testing.decorators import image_comparison
53
import matplotlib.patches as mpatches

‎lib/matplotlib/tests/test_axes.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import six
42
from itertools import chain, product
53
from distutils.version import LooseVersion

‎lib/matplotlib/tests/test_backend_svg.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import six
42

53
import numpy as np

‎lib/matplotlib/tests/test_basic.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import six
42
import sys
53

‎lib/matplotlib/tests/test_bbox_tight.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import numpy as np
42

53
from matplotlib.testing.decorators import image_comparison

‎lib/matplotlib/tests/test_category.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
"""Catch all for categorical functions"""
2-
from __future__ import absolute_import, division, print_function
3-
42
import pytest
53
import numpy as np
64

‎lib/matplotlib/tests/test_cbook.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
21
import itertools
32
import pickle
43
from weakref import ref

‎lib/matplotlib/tests/test_collections.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
"""
22
Tests specific to the collections module.
33
"""
4-
from __future__ import absolute_import, division, print_function
5-
64
import io
75

86
import numpy as np

‎lib/matplotlib/tests/test_colorbar.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import numpy as np
42
import pytest
53

‎lib/matplotlib/tests/test_constrainedlayout.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
from __future__ import (absolute_import, division, print_function,
2-
unicode_literals)
3-
41
import six
52
import warnings
63

7-
84
import numpy as np
95
import pytest
106

‎lib/matplotlib/tests/test_container.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import six
42
import matplotlib.pyplot as plt
53

‎lib/matplotlib/tests/test_contour.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import datetime
42

53
import numpy as np

‎lib/matplotlib/tests/test_figure.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import sys
42
import warnings
53

‎lib/matplotlib/tests/test_lines.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
"""
22
Tests specific to the lines module.
33
"""
4-
from __future__ import absolute_import, division, print_function
5-
64
import itertools
75
import matplotlib.lines as mlines
86
import pytest

‎lib/matplotlib/tests/test_mathtext.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import six
42

53
import io

‎lib/matplotlib/tests/test_mlab.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import six
42

53
import tempfile

‎lib/matplotlib/tests/test_offsetbox.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import pytest
42
from matplotlib.testing.decorators import image_comparison
53
import matplotlib.pyplot as plt

‎lib/matplotlib/tests/test_patches.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
"""
22
Tests specific to the patches module.
33
"""
4-
from __future__ import absolute_import, division, print_function
5-
64
import six
75

86
import numpy as np

‎lib/matplotlib/tests/test_path.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
21
import copy
32

43
import numpy as np

‎lib/matplotlib/tests/test_patheffects.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import numpy as np
42
import pytest
53

‎lib/matplotlib/tests/test_pickle.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
from six.moves import cPickle as pickle
42
from six.moves import range
53

‎lib/matplotlib/tests/test_png.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import six
42
from six import BytesIO
53
import glob

‎lib/matplotlib/tests/test_preprocess_data.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import (absolute_import, division, print_function)
2-
31
import re
42

53
import numpy as np

‎lib/matplotlib/tests/test_quiver.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from __future__ import print_function
21
import warnings
32
import numpy as np
43
import pytest

‎lib/matplotlib/tests/test_sankey.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
from matplotlib.sankey import Sankey
42

53

‎lib/matplotlib/tests/test_scale.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import print_function, unicode_literals
2-
31
from matplotlib.testing.decorators import image_comparison
42
import matplotlib.pyplot as plt
53
from matplotlib.scale import Log10Transform, InvertedLog10Transform

‎lib/matplotlib/tests/test_skew.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
"""
22
Testing that skewed axes properly work
33
"""
4-
from __future__ import absolute_import, division, print_function
5-
64
import itertools
75

86
import matplotlib.pyplot as plt

‎lib/matplotlib/tests/test_spines.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import absolute_import, division, print_function
2-
31
import numpy as np
42

53
import matplotlib.pyplot as plt

0 commit comments

Comments
 (0)