Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 64874e5

Browse filesBrowse files
efiringefiring
authored
Merge pull request #9938 from anntzer/more-unused-imports
Cleanup imports.
2 parents 53d3864 + 23bd9df commit 64874e5
Copy full SHA for 64874e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

61 files changed

+193
-359
lines changed

‎doc/api/api_changes/2017-12-06-imports-AL.rst

Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Removal of unused imports
2+
`````````````````````````
3+
Many unused imports were removed from the codebase. As a result,
4+
trying to import certain classes or functions from the "wrong" module
5+
(e.g. `~.Figure` from :mod:`matplotlib.backends.backend_agg` instead of
6+
:mod:`matplotlib.figure`) will now raise an `ImportError`.

‎lib/matplotlib/afm.py

Copy file name to clipboardExpand all lines: lib/matplotlib/afm.py
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
from six.moves import map
4242

4343
import sys
44-
import os
4544
import re
4645
from ._mathtext_data import uni2type1
4746

‎lib/matplotlib/animation.py

Copy file name to clipboardExpand all lines: lib/matplotlib/animation.py
+14-16Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,31 @@
2323
import six
2424
from six.moves import xrange, zip
2525

26-
import numpy as np
26+
import abc
27+
import contextlib
28+
import itertools
29+
import logging
2730
import os
2831
import platform
2932
import sys
30-
import itertools
31-
try:
32-
# python3
33-
from base64 import encodebytes
34-
except ImportError:
35-
# python2
36-
from base64 import encodestring as encodebytes
37-
import abc
38-
import contextlib
3933
import tempfile
4034
import uuid
41-
import warnings
42-
import logging
35+
36+
import numpy as np
4337

4438
from matplotlib._animation_data import (DISPLAY_TEMPLATE, INCLUDED_FRAMES,
4539
JS_INCLUDE)
4640
from matplotlib.cbook import iterable, deprecated
4741
from matplotlib.compat import subprocess
4842
from matplotlib import rcParams, rcParamsDefault, rc_context
49-
if sys.version_info < (3, 0):
50-
from cStringIO import StringIO as InMemory
43+
44+
if six.PY2:
45+
from base64 import encodestring as encodebytes
46+
from cStringIO import StringIO as BytesIO
5147
else:
52-
from io import BytesIO as InMemory
48+
from base64 import encodebytes
49+
from io import BytesIO
50+
5351

5452
_log = logging.getLogger(__name__)
5553

@@ -870,7 +868,7 @@ def grab_frame(self, **savefig_kwargs):
870868
if self._hit_limit:
871869
return
872870
suffix = '.' + self.frame_format
873-
f = InMemory()
871+
f = BytesIO()
874872
self.fig.savefig(f, format=self.frame_format,
875873
dpi=self.dpi, **savefig_kwargs)
876874
imgdata64 = encodebytes(f.getvalue()).decode('ascii')

‎lib/matplotlib/axes/_subplots.py

Copy file name to clipboardExpand all lines: lib/matplotlib/axes/_subplots.py
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
import matplotlib.artist as martist
1010
from matplotlib.axes._axes import Axes
1111

12-
import warnings
13-
from matplotlib.cbook import mplDeprecation
14-
1512

1613
class SubplotBase(object):
1714
"""

‎lib/matplotlib/backend_bases.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backend_bases.py
+5-15Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,13 @@
4949
from weakref import WeakKeyDictionary
5050

5151
import numpy as np
52-
import matplotlib.cbook as cbook
53-
import matplotlib.colors as colors
54-
import matplotlib.transforms as transforms
55-
import matplotlib.widgets as widgets
56-
from matplotlib import rcParams
57-
from matplotlib import is_interactive
58-
from matplotlib import get_backend
59-
from matplotlib import lines
60-
from matplotlib._pylab_helpers import Gcf
6152

53+
from matplotlib import (
54+
backend_tools as tools, cbook, colors, textpath, tight_bbox, transforms,
55+
widgets, get_backend, is_interactive, rcParams)
56+
from matplotlib._pylab_helpers import Gcf
6257
from matplotlib.transforms import Bbox, TransformedBbox, Affine2D
63-
64-
import matplotlib.tight_bbox as tight_bbox
65-
import matplotlib.textpath as textpath
6658
from matplotlib.path import Path
67-
from matplotlib.cbook import warn_deprecated
68-
import matplotlib.backend_tools as tools
6959

7060
try:
7161
from PIL import Image
@@ -2383,7 +2373,7 @@ def on_press(event):
23832373
23842374
"""
23852375
if s == 'idle_event':
2386-
warn_deprecated(1.5,
2376+
cbook.warn_deprecated(1.5,
23872377
"idle_event is only implemented for the wx backend, and will "
23882378
"be removed in matplotlib 2.1. Use the animations module "
23892379
"instead.")

‎lib/matplotlib/backends/backend_agg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_agg.py
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
from matplotlib import cbook, rcParams, __version__
3232
from matplotlib.backend_bases import (
3333
_Backend, FigureCanvasBase, FigureManagerBase, RendererBase, cursors)
34-
from matplotlib.figure import Figure
3534
from matplotlib.font_manager import findfont, get_font
3635
from matplotlib.ft2font import (LOAD_FORCE_AUTOHINT, LOAD_NO_HINTING,
3736
LOAD_DEFAULT, LOAD_NO_AUTOHINT)

‎lib/matplotlib/backends/backend_cairo.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_cairo.py
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import six
2525

2626
import gzip
27-
import os
2827
import sys
2928
import warnings
3029

@@ -54,10 +53,9 @@
5453
from matplotlib.backend_bases import (
5554
_Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
5655
RendererBase)
57-
from matplotlib.figure import Figure
5856
from matplotlib.mathtext import MathTextParser
5957
from matplotlib.path import Path
60-
from matplotlib.transforms import Bbox, Affine2D
58+
from matplotlib.transforms import Affine2D
6159
from matplotlib.font_manager import ttfFontProperty
6260

6361

‎lib/matplotlib/backends/backend_gdk.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gdk.py
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33

44
import six
55

6-
import math
7-
import os
8-
import sys
96
import warnings
107

118
import gobject
@@ -27,7 +24,6 @@
2724
_Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
2825
RendererBase)
2926
from matplotlib.cbook import warn_deprecated
30-
from matplotlib.figure import Figure
3127
from matplotlib.mathtext import MathTextParser
3228
from matplotlib.transforms import Affine2D
3329
from matplotlib.backends._backend_gdk import pixbuf_get_pixels_array

‎lib/matplotlib/backends/backend_gtk3.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gtk3.py
+3-6Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@
88
import sys
99

1010
import matplotlib
11-
from matplotlib import (
12-
backend_tools, cbook, colors as mcolors, lines, rcParams)
11+
from matplotlib import backend_tools, rcParams
1312
from matplotlib._pylab_helpers import Gcf
1413
from matplotlib.backend_bases import (
15-
_Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
16-
NavigationToolbar2, RendererBase, StatusbarBase, TimerBase,
17-
ToolContainerBase, cursors)
14+
_Backend, FigureCanvasBase, FigureManagerBase, NavigationToolbar2,
15+
StatusbarBase, TimerBase, ToolContainerBase, cursors)
1816
from matplotlib.backend_managers import ToolManager
19-
from matplotlib.cbook import is_writable_file_like
2017
from matplotlib.figure import Figure
2118
from matplotlib.widgets import SubplotTool
2219
from ._gtk3_compat import GLib, GObject, Gtk, Gdk

‎lib/matplotlib/backends/backend_gtk3agg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gtk3agg.py
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from . import backend_agg, backend_gtk3
1010
from .backend_cairo import cairo, HAS_CAIRO_CFFI
1111
from .backend_gtk3 import _BackendGTK3
12-
from matplotlib.figure import Figure
1312
from matplotlib import transforms
1413

1514
if six.PY3 and not HAS_CAIRO_CFFI:

‎lib/matplotlib/backends/backend_gtk3cairo.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gtk3cairo.py
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from .backend_cairo import cairo, HAS_CAIRO_CFFI
88
from .backend_gtk3 import _BackendGTK3
99
from matplotlib.backend_bases import cursors
10-
from matplotlib.figure import Figure
1110

1211

1312
class RendererGTK3Cairo(backend_cairo.RendererCairo):

‎lib/matplotlib/backends/backend_gtkagg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_gtkagg.py
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66

77
import six
88

9-
import os
10-
119
import matplotlib
12-
from matplotlib.figure import Figure
1310
from matplotlib.backends.backend_agg import FigureCanvasAgg
1411
from matplotlib.backends.backend_gtk import (
1512
gtk, _BackendGTK, FigureCanvasGTK, FigureManagerGTK, NavigationToolbar2GTK,

‎lib/matplotlib/backends/backend_macosx.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_macosx.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import matplotlib
1717
from matplotlib.backends import _macosx
1818

19-
from .backend_agg import RendererAgg, FigureCanvasAgg
19+
from .backend_agg import FigureCanvasAgg
2020

2121

2222
########################################################################

‎lib/matplotlib/backends/backend_nbagg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_nbagg.py
+7-17Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
# lib/matplotlib/backends/web_backend/nbagg_uat.ipynb to help verify
44
# that changes made maintain expected behaviour.
55

6-
import datetime
6+
import six
7+
78
from base64 import b64encode
8-
import json
99
import io
10+
import json
1011
import os
11-
import six
12-
from uuid import uuid4 as uuid
13-
14-
import tornado.ioloop
12+
import uuid
1513

1614
from IPython.display import display, Javascript, HTML
1715
try:
@@ -23,19 +21,11 @@
2321

2422
from matplotlib import rcParams, is_interactive
2523
from matplotlib._pylab_helpers import Gcf
24+
from matplotlib.backend_bases import (
25+
_Backend, FigureCanvasBase, NavigationToolbar2)
2626
from matplotlib.backends.backend_webagg_core import (
2727
FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg,
2828
TimerTornado)
29-
from matplotlib.backend_bases import (
30-
_Backend, FigureCanvasBase, NavigationToolbar2)
31-
from matplotlib.figure import Figure
32-
from matplotlib import is_interactive
33-
from matplotlib.backends.backend_webagg_core import (FigureManagerWebAgg,
34-
FigureCanvasWebAggCore,
35-
NavigationToolbar2WebAgg,
36-
TimerTornado)
37-
from matplotlib.backend_bases import (ShowBase, NavigationToolbar2,
38-
FigureCanvasBase)
3929

4030

4131
def connection_info():
@@ -174,7 +164,7 @@ class CommSocket(object):
174164
def __init__(self, manager):
175165
self.supports_binary = None
176166
self.manager = manager
177-
self.uuid = str(uuid())
167+
self.uuid = str(uuid.uuid4())
178168
# Publish an output area with a unique ID. The javascript can then
179169
# hook into this area.
180170
display(HTML("<div id=%r></div>" % self.uuid))

‎lib/matplotlib/backends/backend_pdf.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_pdf.py
+7-10Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,25 @@
88
unicode_literals)
99

1010
import six
11+
from six import unichr
1112

1213
import codecs
14+
import collections
15+
from datetime import datetime
16+
from functools import total_ordering
17+
from io import BytesIO
18+
import logging
19+
from math import ceil, cos, floor, pi, sin
1320
import os
1421
import re
1522
import struct
1623
import sys
1724
import time
1825
import warnings
19-
import logging
2026
import zlib
21-
import collections
22-
from io import BytesIO
23-
from functools import total_ordering
2427

2528
import numpy as np
26-
from six import unichr
27-
28-
29-
from datetime import datetime, tzinfo, timedelta
30-
from math import ceil, cos, floor, pi, sin
3129

32-
import matplotlib
3330
from matplotlib import __version__, rcParams
3431
from matplotlib._pylab_helpers import Gcf
3532
from matplotlib.backend_bases import (

‎lib/matplotlib/backends/backend_pgf.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_pgf.py
+7-11Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,28 @@
33

44
import six
55

6+
import atexit
7+
import codecs
8+
import errno
69
import math
710
import os
8-
import sys
9-
import errno
1011
import re
1112
import shutil
13+
import sys
1214
import tempfile
13-
import codecs
14-
import atexit
15-
import weakref
1615
import warnings
17-
18-
import numpy as np
16+
import weakref
1917

2018
import matplotlib as mpl
19+
from matplotlib import _png, rcParams
2120
from matplotlib.backend_bases import (
2221
_Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
2322
RendererBase)
2423
from matplotlib.backends.backend_mixed import MixedModeRenderer
25-
from matplotlib.figure import Figure
26-
from matplotlib.text import Text
27-
from matplotlib.path import Path
28-
from matplotlib import _png, rcParams
2924
from matplotlib.cbook import is_writable_file_like
3025
from matplotlib.compat import subprocess
3126
from matplotlib.compat.subprocess import check_output
27+
from matplotlib.path import Path
3228

3329

3430
###############################################################################

‎lib/matplotlib/backends/backend_ps.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_ps.py
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from matplotlib.cbook import (get_realpath_and_stat, is_writable_file_like,
2323
maxdict, file_requires_unicode)
2424
from matplotlib.compat.subprocess import subprocess
25-
from matplotlib.figure import Figure
2625

2726
from matplotlib.font_manager import findfont, is_opentype_cff_font, get_font
2827
from matplotlib.ft2font import KERNING_DEFAULT, LOAD_NO_HINTING

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.