Skip to content

Commit bf67b92

Browse files
anntzeranntzer
committed
Cleanup imports.
1 parent 96074c7 commit bf67b92

Some content is hidden

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

58 files changed

+160
-306
lines changed

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

Lines 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

Lines 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

Lines 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

@@ -875,7 +873,7 @@ def grab_frame(self, **savefig_kwargs):
875873
if self._hit_limit:
876874
return
877875
suffix = '.' + self.frame_format
878-
f = InMemory()
876+
f = BytesIO()
879877
self.fig.savefig(f, format=self.frame_format,
880878
dpi=self.dpi, **savefig_kwargs)
881879
imgdata64 = encodebytes(f.getvalue()).decode('ascii')

‎lib/matplotlib/axes/_subplots.py

Lines 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

Lines 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
@@ -2384,7 +2374,7 @@ def on_press(event):
23842374
23852375
"""
23862376
if s == 'idle_event':
2387-
warn_deprecated(1.5,
2377+
cbook.warn_deprecated(1.5,
23882378
"idle_event is only implemented for the wx backend, and will "
23892379
"be removed in matplotlib 2.1. Use the animations module "
23902380
"instead.")

‎lib/matplotlib/backends/backend_agg.py

Lines 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

Lines 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

Lines 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

Lines 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

Lines 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:

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy