Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commitbf67b92

Browse files
committed
Cleanup imports.
1 parent96074c7 commitbf67b92

File tree

58 files changed

+160
-306
lines changed

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
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
fromsix.movesimportmap
4242

4343
importsys
44-
importos
4544
importre
4645
from ._mathtext_dataimportuni2type1
4746

‎lib/matplotlib/animation.py

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,31 @@
2323
importsix
2424
fromsix.movesimportxrange,zip
2525

26-
importnumpyasnp
26+
importabc
27+
importcontextlib
28+
importitertools
29+
importlogging
2730
importos
2831
importplatform
2932
importsys
30-
importitertools
31-
try:
32-
# python3
33-
frombase64importencodebytes
34-
exceptImportError:
35-
# python2
36-
frombase64importencodestringasencodebytes
37-
importabc
38-
importcontextlib
3933
importtempfile
4034
importuuid
41-
importwarnings
42-
importlogging
35+
36+
importnumpyasnp
4337

4438
frommatplotlib._animation_dataimport (DISPLAY_TEMPLATE,INCLUDED_FRAMES,
4539
JS_INCLUDE)
4640
frommatplotlib.cbookimportiterable,deprecated
4741
frommatplotlib.compatimportsubprocess
4842
frommatplotlibimportrcParams,rcParamsDefault,rc_context
49-
ifsys.version_info< (3,0):
50-
fromcStringIOimportStringIOasInMemory
43+
44+
ifsix.PY2:
45+
frombase64importencodestringasencodebytes
46+
fromcStringIOimportStringIOasBytesIO
5147
else:
52-
fromioimportBytesIOasInMemory
48+
frombase64importencodebytes
49+
fromioimportBytesIO
50+
5351

5452
_log=logging.getLogger(__name__)
5553

@@ -875,7 +873,7 @@ def grab_frame(self, **savefig_kwargs):
875873
ifself._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
importmatplotlib.artistasmartist
1010
frommatplotlib.axes._axesimportAxes
1111

12-
importwarnings
13-
frommatplotlib.cbookimportmplDeprecation
14-
1512

1613
classSubplotBase(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
fromweakrefimportWeakKeyDictionary
5050

5151
importnumpyasnp
52-
importmatplotlib.cbookascbook
53-
importmatplotlib.colorsascolors
54-
importmatplotlib.transformsastransforms
55-
importmatplotlib.widgetsaswidgets
56-
frommatplotlibimportrcParams
57-
frommatplotlibimportis_interactive
58-
frommatplotlibimportget_backend
59-
frommatplotlibimportlines
60-
frommatplotlib._pylab_helpersimportGcf
6152

53+
frommatplotlibimport (
54+
backend_toolsastools,cbook,colors,textpath,tight_bbox,transforms,
55+
widgets,get_backend,is_interactive,rcParams)
56+
frommatplotlib._pylab_helpersimportGcf
6257
frommatplotlib.transformsimportBbox,TransformedBbox,Affine2D
63-
64-
importmatplotlib.tight_bboxastight_bbox
65-
importmatplotlib.textpathastextpath
6658
frommatplotlib.pathimportPath
67-
frommatplotlib.cbookimportwarn_deprecated
68-
importmatplotlib.backend_toolsastools
6959

7060
try:
7161
fromPILimportImage
@@ -2384,7 +2374,7 @@ def on_press(event):
23842374
23852375
"""
23862376
ifs=='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
frommatplotlibimportcbook,rcParams,__version__
3232
frommatplotlib.backend_basesimport (
3333
_Backend,FigureCanvasBase,FigureManagerBase,RendererBase,cursors)
34-
frommatplotlib.figureimportFigure
3534
frommatplotlib.font_managerimportfindfont,get_font
3635
frommatplotlib.ft2fontimport (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
importsix
2525

2626
importgzip
27-
importos
2827
importsys
2928
importwarnings
3029

@@ -54,10 +53,9 @@
5453
frommatplotlib.backend_basesimport (
5554
_Backend,FigureCanvasBase,FigureManagerBase,GraphicsContextBase,
5655
RendererBase)
57-
frommatplotlib.figureimportFigure
5856
frommatplotlib.mathtextimportMathTextParser
5957
frommatplotlib.pathimportPath
60-
frommatplotlib.transformsimportBbox,Affine2D
58+
frommatplotlib.transformsimportAffine2D
6159
frommatplotlib.font_managerimportttfFontProperty
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
importsix
55

6-
importmath
7-
importos
8-
importsys
96
importwarnings
107

118
importgobject
@@ -27,7 +24,6 @@
2724
_Backend,FigureCanvasBase,FigureManagerBase,GraphicsContextBase,
2825
RendererBase)
2926
frommatplotlib.cbookimportwarn_deprecated
30-
frommatplotlib.figureimportFigure
3127
frommatplotlib.mathtextimportMathTextParser
3228
frommatplotlib.transformsimportAffine2D
3329
frommatplotlib.backends._backend_gdkimportpixbuf_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
importsys
99

1010
importmatplotlib
11-
frommatplotlibimport (
12-
backend_tools,cbook,colorsasmcolors,lines,rcParams)
11+
frommatplotlibimportbackend_tools,rcParams
1312
frommatplotlib._pylab_helpersimportGcf
1413
frommatplotlib.backend_basesimport (
15-
_Backend,FigureCanvasBase,FigureManagerBase,GraphicsContextBase,
16-
NavigationToolbar2,RendererBase,StatusbarBase,TimerBase,
17-
ToolContainerBase,cursors)
14+
_Backend,FigureCanvasBase,FigureManagerBase,NavigationToolbar2,
15+
StatusbarBase,TimerBase,ToolContainerBase,cursors)
1816
frommatplotlib.backend_managersimportToolManager
19-
frommatplotlib.cbookimportis_writable_file_like
2017
frommatplotlib.figureimportFigure
2118
frommatplotlib.widgetsimportSubplotTool
2219
from ._gtk3_compatimportGLib,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 .importbackend_agg,backend_gtk3
1010
from .backend_cairoimportcairo,HAS_CAIRO_CFFI
1111
from .backend_gtk3import_BackendGTK3
12-
frommatplotlib.figureimportFigure
1312
frommatplotlibimporttransforms
1413

1514
ifsix.PY3andnotHAS_CAIRO_CFFI:

‎lib/matplotlib/backends/backend_gtk3cairo.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from .backend_cairoimportcairo,HAS_CAIRO_CFFI
88
from .backend_gtk3import_BackendGTK3
99
frommatplotlib.backend_basesimportcursors
10-
frommatplotlib.figureimportFigure
1110

1211

1312
classRendererGTK3Cairo(backend_cairo.RendererCairo):

‎lib/matplotlib/backends/backend_gtkagg.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66

77
importsix
88

9-
importos
10-
119
importmatplotlib
12-
frommatplotlib.figureimportFigure
1310
frommatplotlib.backends.backend_aggimportFigureCanvasAgg
1411
frommatplotlib.backends.backend_gtkimport (
1512
gtk,_BackendGTK,FigureCanvasGTK,FigureManagerGTK,NavigationToolbar2GTK,

‎lib/matplotlib/backends/backend_macosx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
importmatplotlib
1717
frommatplotlib.backendsimport_macosx
1818

19-
from .backend_aggimportRendererAgg,FigureCanvasAgg
19+
from .backend_aggimportFigureCanvasAgg
2020

2121

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

‎lib/matplotlib/backends/backend_nbagg.py

Lines 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-
importdatetime
6+
importsix
7+
78
frombase64importb64encode
8-
importjson
99
importio
10+
importjson
1011
importos
11-
importsix
12-
fromuuidimportuuid4asuuid
13-
14-
importtornado.ioloop
12+
importuuid
1513

1614
fromIPython.displayimportdisplay,Javascript,HTML
1715
try:
@@ -23,19 +21,11 @@
2321

2422
frommatplotlibimportrcParams,is_interactive
2523
frommatplotlib._pylab_helpersimportGcf
24+
frommatplotlib.backend_basesimport (
25+
_Backend,FigureCanvasBase,NavigationToolbar2)
2626
frommatplotlib.backends.backend_webagg_coreimport (
2727
FigureCanvasWebAggCore,FigureManagerWebAgg,NavigationToolbar2WebAgg,
2828
TimerTornado)
29-
frommatplotlib.backend_basesimport (
30-
_Backend,FigureCanvasBase,NavigationToolbar2)
31-
frommatplotlib.figureimportFigure
32-
frommatplotlibimportis_interactive
33-
frommatplotlib.backends.backend_webagg_coreimport (FigureManagerWebAgg,
34-
FigureCanvasWebAggCore,
35-
NavigationToolbar2WebAgg,
36-
TimerTornado)
37-
frommatplotlib.backend_basesimport (ShowBase,NavigationToolbar2,
38-
FigureCanvasBase)
3929

4030

4131
defconnection_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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,25 @@
88
unicode_literals)
99

1010
importsix
11+
fromsiximportunichr
1112

1213
importcodecs
14+
importcollections
15+
fromdatetimeimportdatetime
16+
fromfunctoolsimporttotal_ordering
17+
fromioimportBytesIO
18+
importlogging
19+
frommathimportceil,cos,floor,pi,sin
1320
importos
1421
importre
1522
importstruct
1623
importsys
1724
importtime
1825
importwarnings
19-
importlogging
2026
importzlib
21-
importcollections
22-
fromioimportBytesIO
23-
fromfunctoolsimporttotal_ordering
2427

2528
importnumpyasnp
26-
fromsiximportunichr
27-
28-
29-
fromdatetimeimportdatetime,tzinfo,timedelta
30-
frommathimportceil,cos,floor,pi,sin
3129

32-
importmatplotlib
3330
frommatplotlibimport__version__,rcParams
3431
frommatplotlib._pylab_helpersimportGcf
3532
frommatplotlib.backend_basesimport (

‎lib/matplotlib/backends/backend_pgf.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,28 @@
33

44
importsix
55

6+
importatexit
7+
importcodecs
8+
importerrno
69
importmath
710
importos
8-
importsys
9-
importerrno
1011
importre
1112
importshutil
13+
importsys
1214
importtempfile
13-
importcodecs
14-
importatexit
15-
importweakref
1615
importwarnings
17-
18-
importnumpyasnp
16+
importweakref
1917

2018
importmatplotlibasmpl
19+
frommatplotlibimport_png,rcParams
2120
frommatplotlib.backend_basesimport (
2221
_Backend,FigureCanvasBase,FigureManagerBase,GraphicsContextBase,
2322
RendererBase)
2423
frommatplotlib.backends.backend_mixedimportMixedModeRenderer
25-
frommatplotlib.figureimportFigure
26-
frommatplotlib.textimportText
27-
frommatplotlib.pathimportPath
28-
frommatplotlibimport_png,rcParams
2924
frommatplotlib.cbookimportis_writable_file_like
3025
frommatplotlib.compatimportsubprocess
3126
frommatplotlib.compat.subprocessimportcheck_output
27+
frommatplotlib.pathimportPath
3228

3329

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

‎lib/matplotlib/backends/backend_ps.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
frommatplotlib.cbookimport (get_realpath_and_stat,is_writable_file_like,
2323
maxdict,file_requires_unicode)
2424
frommatplotlib.compat.subprocessimportsubprocess
25-
frommatplotlib.figureimportFigure
2625

2726
frommatplotlib.font_managerimportfindfont,is_opentype_cff_font,get_font
2827
frommatplotlib.ft2fontimportKERNING_DEFAULT,LOAD_NO_HINTING

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp