Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Cleanup imports. #9938

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 2 commits into from
Dec 29, 2017
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
6 changes: 6 additions & 0 deletions doc/api/api_changes/2017-12-06-imports-AL.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Removal of unused imports
`````````````````````````
Many unused imports were removed from the codebase. As a result,
trying to import certain classes or functions from the "wrong" module
(e.g. `~.Figure` from :mod:`matplotlib.backends.backend_agg` instead of
:mod:`matplotlib.figure`) will now raise an `ImportError`.
1 change: 0 additions & 1 deletion lib/matplotlib/afm.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
from six.moves import map

import sys
import os
import re
from ._mathtext_data import uni2type1

Expand Down
30 changes: 14 additions & 16 deletions lib/matplotlib/animation.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,31 @@
import six
from six.moves import xrange, zip

import numpy as np
import abc
import contextlib
import itertools
import logging
import os
import platform
import sys
import itertools
try:
# python3
from base64 import encodebytes
except ImportError:
# python2
from base64 import encodestring as encodebytes
import abc
import contextlib
import tempfile
import uuid
import warnings
import logging

import numpy as np

from matplotlib._animation_data import (DISPLAY_TEMPLATE, INCLUDED_FRAMES,
JS_INCLUDE)
from matplotlib.cbook import iterable, deprecated
from matplotlib.compat import subprocess
from matplotlib import rcParams, rcParamsDefault, rc_context
if sys.version_info < (3, 0):
from cStringIO import StringIO as InMemory

if six.PY2:
from base64 import encodestring as encodebytes
from cStringIO import StringIO as BytesIO
else:
from io import BytesIO as InMemory
from base64 import encodebytes
from io import BytesIO


_log = logging.getLogger(__name__)

Expand Down Expand Up @@ -875,7 +873,7 @@ def grab_frame(self, **savefig_kwargs):
if self._hit_limit:
return
suffix = '.' + self.frame_format
f = InMemory()
f = BytesIO()
self.fig.savefig(f, format=self.frame_format,
dpi=self.dpi, **savefig_kwargs)
imgdata64 = encodebytes(f.getvalue()).decode('ascii')
Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/axes/_subplots.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
import matplotlib.artist as martist
from matplotlib.axes._axes import Axes

import warnings
from matplotlib.cbook import mplDeprecation


class SubplotBase(object):
"""
Expand Down
20 changes: 5 additions & 15 deletions lib/matplotlib/backend_bases.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,13 @@
from weakref import WeakKeyDictionary

import numpy as np
import matplotlib.cbook as cbook
import matplotlib.colors as colors
import matplotlib.transforms as transforms
import matplotlib.widgets as widgets
from matplotlib import rcParams
from matplotlib import is_interactive
from matplotlib import get_backend
from matplotlib import lines
from matplotlib._pylab_helpers import Gcf

from matplotlib import (
backend_tools as tools, cbook, colors, textpath, tight_bbox, transforms,
widgets, get_backend, is_interactive, rcParams)
from matplotlib._pylab_helpers import Gcf
from matplotlib.transforms import Bbox, TransformedBbox, Affine2D

import matplotlib.tight_bbox as tight_bbox
import matplotlib.textpath as textpath
from matplotlib.path import Path
from matplotlib.cbook import warn_deprecated
import matplotlib.backend_tools as tools

try:
from PIL import Image
Expand Down Expand Up @@ -2384,7 +2374,7 @@ def on_press(event):

"""
if s == 'idle_event':
warn_deprecated(1.5,
cbook.warn_deprecated(1.5,
"idle_event is only implemented for the wx backend, and will "
"be removed in matplotlib 2.1. Use the animations module "
"instead.")
Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/backends/backend_agg.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
from matplotlib import cbook, rcParams, __version__
from matplotlib.backend_bases import (
_Backend, FigureCanvasBase, FigureManagerBase, RendererBase, cursors)
from matplotlib.figure import Figure
from matplotlib.font_manager import findfont, get_font
from matplotlib.ft2font import (LOAD_FORCE_AUTOHINT, LOAD_NO_HINTING,
LOAD_DEFAULT, LOAD_NO_AUTOHINT)
Expand Down
4 changes: 1 addition & 3 deletions lib/matplotlib/backends/backend_cairo.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import six

import gzip
import os
import sys
import warnings

Expand Down Expand Up @@ -54,10 +53,9 @@
from matplotlib.backend_bases import (
_Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
RendererBase)
from matplotlib.figure import Figure
from matplotlib.mathtext import MathTextParser
from matplotlib.path import Path
from matplotlib.transforms import Bbox, Affine2D
from matplotlib.transforms import Affine2D
from matplotlib.font_manager import ttfFontProperty


Expand Down
4 changes: 0 additions & 4 deletions lib/matplotlib/backends/backend_gdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

import six

import math
import os
import sys
import warnings

import gobject
Expand All @@ -27,7 +24,6 @@
_Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
RendererBase)
from matplotlib.cbook import warn_deprecated
from matplotlib.figure import Figure
from matplotlib.mathtext import MathTextParser
from matplotlib.transforms import Affine2D
from matplotlib.backends._backend_gdk import pixbuf_get_pixels_array
Expand Down
9 changes: 3 additions & 6 deletions lib/matplotlib/backends/backend_gtk3.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@
import sys

import matplotlib
from matplotlib import (
backend_tools, cbook, colors as mcolors, lines, rcParams)
from matplotlib import backend_tools, rcParams
from matplotlib._pylab_helpers import Gcf
from matplotlib.backend_bases import (
_Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
NavigationToolbar2, RendererBase, StatusbarBase, TimerBase,
ToolContainerBase, cursors)
_Backend, FigureCanvasBase, FigureManagerBase, NavigationToolbar2,
StatusbarBase, TimerBase, ToolContainerBase, cursors)
from matplotlib.backend_managers import ToolManager
from matplotlib.cbook import is_writable_file_like
from matplotlib.figure import Figure
from matplotlib.widgets import SubplotTool
from ._gtk3_compat import GLib, GObject, Gtk, Gdk
Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/backends/backend_gtk3agg.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from . import backend_agg, backend_gtk3
from .backend_cairo import cairo, HAS_CAIRO_CFFI
from .backend_gtk3 import _BackendGTK3
from matplotlib.figure import Figure
from matplotlib import transforms

if six.PY3 and not HAS_CAIRO_CFFI:
Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/backends/backend_gtk3cairo.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from .backend_cairo import cairo, HAS_CAIRO_CFFI
from .backend_gtk3 import _BackendGTK3
from matplotlib.backend_bases import cursors
from matplotlib.figure import Figure


class RendererGTK3Cairo(backend_cairo.RendererCairo):
Expand Down
3 changes: 0 additions & 3 deletions lib/matplotlib/backends/backend_gtkagg.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@

import six

import os

import matplotlib
from matplotlib.figure import Figure
from matplotlib.backends.backend_agg import FigureCanvasAgg
from matplotlib.backends.backend_gtk import (
gtk, _BackendGTK, FigureCanvasGTK, FigureManagerGTK, NavigationToolbar2GTK,
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/backend_macosx.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import matplotlib
from matplotlib.backends import _macosx

from .backend_agg import RendererAgg, FigureCanvasAgg
from .backend_agg import FigureCanvasAgg


########################################################################
Expand Down
24 changes: 7 additions & 17 deletions lib/matplotlib/backends/backend_nbagg.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
# lib/matplotlib/backends/web_backend/nbagg_uat.ipynb to help verify
# that changes made maintain expected behaviour.

import datetime
import six

from base64 import b64encode
import json
import io
import json
import os
import six
from uuid import uuid4 as uuid

import tornado.ioloop
import uuid

from IPython.display import display, Javascript, HTML
try:
Expand All @@ -23,19 +21,11 @@

from matplotlib import rcParams, is_interactive
from matplotlib._pylab_helpers import Gcf
from matplotlib.backend_bases import (
_Backend, FigureCanvasBase, NavigationToolbar2)
from matplotlib.backends.backend_webagg_core import (
FigureCanvasWebAggCore, FigureManagerWebAgg, NavigationToolbar2WebAgg,
TimerTornado)
from matplotlib.backend_bases import (
_Backend, FigureCanvasBase, NavigationToolbar2)
from matplotlib.figure import Figure
from matplotlib import is_interactive
from matplotlib.backends.backend_webagg_core import (FigureManagerWebAgg,
FigureCanvasWebAggCore,
NavigationToolbar2WebAgg,
TimerTornado)
from matplotlib.backend_bases import (ShowBase, NavigationToolbar2,
FigureCanvasBase)


def connection_info():
Expand Down Expand Up @@ -174,7 +164,7 @@ class CommSocket(object):
def __init__(self, manager):
self.supports_binary = None
self.manager = manager
self.uuid = str(uuid())
self.uuid = str(uuid.uuid4())
# Publish an output area with a unique ID. The javascript can then
# hook into this area.
display(HTML("<div id=%r></div>" % self.uuid))
Expand Down
17 changes: 7 additions & 10 deletions lib/matplotlib/backends/backend_pdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,25 @@
unicode_literals)

import six
from six import unichr

import codecs
import collections
from datetime import datetime
from functools import total_ordering
from io import BytesIO
import logging
from math import ceil, cos, floor, pi, sin
import os
import re
import struct
import sys
import time
import warnings
import logging
import zlib
import collections
from io import BytesIO
from functools import total_ordering

import numpy as np
from six import unichr


from datetime import datetime, tzinfo, timedelta
from math import ceil, cos, floor, pi, sin

import matplotlib
from matplotlib import __version__, rcParams
from matplotlib._pylab_helpers import Gcf
from matplotlib.backend_bases import (
Expand Down
18 changes: 7 additions & 11 deletions lib/matplotlib/backends/backend_pgf.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,28 @@

import six

import atexit
import codecs
import errno
import math
import os
import sys
import errno
import re
import shutil
import sys
import tempfile
import codecs
import atexit
import weakref
import warnings

import numpy as np
import weakref

import matplotlib as mpl
from matplotlib import _png, rcParams
from matplotlib.backend_bases import (
_Backend, FigureCanvasBase, FigureManagerBase, GraphicsContextBase,
RendererBase)
from matplotlib.backends.backend_mixed import MixedModeRenderer
from matplotlib.figure import Figure
from matplotlib.text import Text
from matplotlib.path import Path
from matplotlib import _png, rcParams
from matplotlib.cbook import is_writable_file_like
from matplotlib.compat import subprocess
from matplotlib.compat.subprocess import check_output
from matplotlib.path import Path


###############################################################################
Expand Down
1 change: 0 additions & 1 deletion lib/matplotlib/backends/backend_ps.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
from matplotlib.cbook import (get_realpath_and_stat, is_writable_file_like,
maxdict, file_requires_unicode)
from matplotlib.compat.subprocess import subprocess
from matplotlib.figure import Figure

from matplotlib.font_manager import findfont, is_opentype_cff_font, get_font
from matplotlib.ft2font import KERNING_DEFAULT, LOAD_NO_HINTING
Expand Down
Loading