From: Kelvin Li <ltw...@gm...> - 2015-04-20 06:07:01
|
--- lib/matplotlib/backends/backend_agg.py | 2 -- lib/matplotlib/backends/backend_cairo.py | 5 ++-- lib/matplotlib/backends/backend_gdk.py | 9 ------- lib/matplotlib/backends/backend_gtk.py | 7 +++-- lib/matplotlib/backends/backend_gtk3agg.py | 1 - lib/matplotlib/backends/backend_gtk3cairo.py | 2 -- lib/matplotlib/backends/backend_gtkagg.py | 7 +---- lib/matplotlib/backends/backend_gtkcairo.py | 3 --- lib/matplotlib/backends/backend_macosx.py | 11 +++----- lib/matplotlib/backends/backend_mixed.py | 2 -- lib/matplotlib/backends/backend_nbagg.py | 2 -- lib/matplotlib/backends/backend_pgf.py | 2 -- lib/matplotlib/backends/backend_ps.py | 23 +++------------- lib/matplotlib/backends/backend_qt4.py | 36 ++------------------------ lib/matplotlib/backends/backend_qt4agg.py | 11 -------- lib/matplotlib/backends/backend_qt5agg.py | 9 ------- lib/matplotlib/backends/backend_svg.py | 12 ++++----- lib/matplotlib/backends/backend_template.py | 4 --- lib/matplotlib/backends/backend_tkagg.py | 13 +++------- lib/matplotlib/backends/backend_webagg.py | 1 - lib/matplotlib/backends/backend_webagg_core.py | 4 --- lib/matplotlib/backends/backend_wx.py | 2 -- lib/matplotlib/backends/backend_wxagg.py | 9 +++---- lib/matplotlib/backends/tkagg.py | 3 --- lib/matplotlib/backends/windowing.py | 2 -- 25 files changed, 26 insertions(+), 156 deletions(-) diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py index 687e52b..a048014 100644 --- a/lib/matplotlib/backends/backend_agg.py +++ b/lib/matplotlib/backends/backend_agg.py @@ -22,8 +22,6 @@ TODO: from __future__ import (absolute_import, division, print_function, unicode_literals) -import six - import threading import numpy as np diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py index 5956982..0402a26 100644 --- a/lib/matplotlib/backends/backend_cairo.py +++ b/lib/matplotlib/backends/backend_cairo.py @@ -23,7 +23,7 @@ from __future__ import (absolute_import, division, print_function, import six -import os, sys, warnings, gzip +import sys, warnings, gzip import numpy as np @@ -55,11 +55,10 @@ from matplotlib.cbook import is_string_like 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 _debug = False -#_debug = True # Image::color_conv(format) for draw_image() if sys.byteorder == 'little': diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py index d3e8e5b..51912aa 100644 --- a/lib/matplotlib/backends/backend_gdk.py +++ b/lib/matplotlib/backends/backend_gdk.py @@ -1,15 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -import six - -import math -import os -import sys import warnings -def fn_name(): return sys._getframe(1).f_code.co_name -import gobject import gtk; gdk = gtk.gdk import pango pygtk_version_required = (2,2,0) @@ -23,10 +16,8 @@ import numpy as np import matplotlib from matplotlib import rcParams -from matplotlib._pylab_helpers import Gcf from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \ FigureManagerBase, FigureCanvasBase -from matplotlib.cbook import is_string_like from matplotlib.figure import Figure from matplotlib.mathtext import MathTextParser from matplotlib.transforms import Affine2D diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py index 1a6ee31..9febd7a 100644 --- a/lib/matplotlib/backends/backend_gtk.py +++ b/lib/matplotlib/backends/backend_gtk.py @@ -29,11 +29,11 @@ _new_tooltip_api = (gtk.pygtk_version[1] >= 12) import matplotlib from matplotlib._pylab_helpers import Gcf -from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \ - FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors, TimerBase +from matplotlib.backend_bases import (FigureManagerBase, FigureCanvasBase, + NavigationToolbar2, cursors, TimerBase) from matplotlib.backend_bases import ShowBase -from matplotlib.backends.backend_gdk import RendererGDK, FigureCanvasGDK +from matplotlib.backends.backend_gdk import RendererGDK from matplotlib.cbook import is_string_like, is_writable_file_like from matplotlib.colors import colorConverter from matplotlib.figure import Figure @@ -48,7 +48,6 @@ from matplotlib import rcParams backend_version = "%d.%d.%d" % gtk.pygtk_version _debug = False -#_debug = True # the true dots per inch on the screen; should be display dependent # see http://groups.google.com/groups?q=screen+dpi+x11&hl=en&lr=&ie=UTF-8&oe=UTF-8&safe=off&selm=7077.26e81ad5%40swift.cs.tcd.ie&rnum=5 for some info about screen dpi diff --git a/lib/matplotlib/backends/backend_gtk3agg.py b/lib/matplotlib/backends/backend_gtk3agg.py index c3eb1da..7a98311 100644 --- a/lib/matplotlib/backends/backend_gtk3agg.py +++ b/lib/matplotlib/backends/backend_gtk3agg.py @@ -4,7 +4,6 @@ from __future__ import (absolute_import, division, print_function, import six import numpy as np -import sys import warnings from . import backend_agg diff --git a/lib/matplotlib/backends/backend_gtk3cairo.py b/lib/matplotlib/backends/backend_gtk3cairo.py index da8f099..dde3b08 100644 --- a/lib/matplotlib/backends/backend_gtk3cairo.py +++ b/lib/matplotlib/backends/backend_gtk3cairo.py @@ -1,8 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -import six - from . import backend_gtk3 from . import backend_cairo from .backend_cairo import cairo, HAS_CAIRO_CFFI diff --git a/lib/matplotlib/backends/backend_gtkagg.py b/lib/matplotlib/backends/backend_gtkagg.py index 3e10841..8177d2b 100644 --- a/lib/matplotlib/backends/backend_gtkagg.py +++ b/lib/matplotlib/backends/backend_gtkagg.py @@ -4,16 +4,11 @@ Render to gtk from agg from __future__ import (absolute_import, division, print_function, unicode_literals) -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, FigureManagerGTK, FigureCanvasGTK,\ - show, draw_if_interactive,\ - error_msg_gtk, PIXELS_PER_INCH, backend_version, \ + backend_version, \ NavigationToolbar2GTK from matplotlib.backends._gtkagg import agg_to_gtk_drawable diff --git a/lib/matplotlib/backends/backend_gtkcairo.py b/lib/matplotlib/backends/backend_gtkcairo.py index 93bb698..94d0dd8 100644 --- a/lib/matplotlib/backends/backend_gtkcairo.py +++ b/lib/matplotlib/backends/backend_gtkcairo.py @@ -5,8 +5,6 @@ Author: Steve Chaplin from __future__ import (absolute_import, division, print_function, unicode_literals) -import six - import gtk if gtk.pygtk_version < (2,7,0): import cairo.gtk @@ -19,7 +17,6 @@ backend_version = 'PyGTK(%d.%d.%d) ' % gtk.pygtk_version + \ _debug = False -#_debug = True def new_figure_manager(num, *args, **kwargs): diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py index ef4572f..05f568f 100755 --- a/lib/matplotlib/backends/backend_macosx.py +++ b/lib/matplotlib/backends/backend_macosx.py @@ -2,28 +2,23 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) import six - import os import numpy from matplotlib._pylab_helpers import Gcf -from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\ - FigureManagerBase, FigureCanvasBase, NavigationToolbar2, TimerBase -from matplotlib.backend_bases import ShowBase +from matplotlib.backend_bases import (RendererBase, GraphicsContextBase, + FigureManagerBase, FigureCanvasBase, NavigationToolbar2, TimerBase, + ShowBase) from matplotlib.cbook import maxdict from matplotlib.figure import Figure -from matplotlib.path import Path from matplotlib.mathtext import MathTextParser -from matplotlib.colors import colorConverter from matplotlib import rcParams - from matplotlib.widgets import SubplotTool import matplotlib from matplotlib.backends import _macosx - class Show(ShowBase): def mainloop(self): _macosx.show() diff --git a/lib/matplotlib/backends/backend_mixed.py b/lib/matplotlib/backends/backend_mixed.py index 6de45ed..d63985c 100644 --- a/lib/matplotlib/backends/backend_mixed.py +++ b/lib/matplotlib/backends/backend_mixed.py @@ -1,8 +1,6 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -import six - from matplotlib._image import frombuffer from matplotlib.backends.backend_agg import RendererAgg from matplotlib.tight_bbox import process_figure_for_rasterizing diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py index eada1c1..d72c0e2 100644 --- a/lib/matplotlib/backends/backend_nbagg.py +++ b/lib/matplotlib/backends/backend_nbagg.py @@ -4,7 +4,6 @@ # that changes made maintain expected behaviour. from base64 import b64encode -from contextlib import contextmanager import json import io import os @@ -18,7 +17,6 @@ from IPython.kernel.comm import Comm from matplotlib import rcParams from matplotlib.figure import Figure -from matplotlib.backends import backend_agg from matplotlib.backends.backend_webagg_core import (FigureManagerWebAgg, FigureCanvasWebAggCore, NavigationToolbar2WebAgg) diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py index db8cda3..69b1cb1 100644 --- a/lib/matplotlib/backends/backend_pgf.py +++ b/lib/matplotlib/backends/backend_pgf.py @@ -22,14 +22,12 @@ from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\ FigureManagerBase, FigureCanvasBase 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_string_like, is_writable_file_like from matplotlib.compat import subprocess from matplotlib.compat.subprocess import check_output - ############################################################################### # create a list of system fonts, all of these should work with xe/lua-latex diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py index 699d1ba..68f0db8 100644 --- a/lib/matplotlib/backends/backend_ps.py +++ b/lib/matplotlib/backends/backend_ps.py @@ -5,21 +5,15 @@ A PostScript backend, which can produce both PostScript .ps and .eps from __future__ import (absolute_import, division, print_function, unicode_literals) +import binascii, glob, io, os, re, shutil, sys, time +from tempfile import mkstemp + import six from six.moves import StringIO -import glob, math, os, shutil, sys, time -def _fn_name(): return sys._getframe(1).f_code.co_name -import io - -try: - from hashlib import md5 -except ImportError: - from md5 import md5 #Deprecated in 2.5 +import numpy as np -from tempfile import mkstemp from matplotlib import verbose, __version__, rcParams, checkdep_ghostscript -from matplotlib._pylab_helpers import Gcf from matplotlib.afm import AFM from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\ FigureManagerBase, FigureCanvasBase @@ -27,33 +21,24 @@ from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\ from matplotlib.cbook import is_string_like, get_realpath_and_stat, \ is_writable_file_like, maxdict, file_requires_unicode from matplotlib.figure import Figure - from matplotlib.font_manager import findfont, is_opentype_cff_font from matplotlib.ft2font import FT2Font, KERNING_DEFAULT, LOAD_NO_HINTING from matplotlib.ttconv import convert_ttf_to_ps from matplotlib.mathtext import MathTextParser from matplotlib._mathtext_data import uni2type1 -from matplotlib.text import Text from matplotlib.path import Path from matplotlib import _path from matplotlib.transforms import Affine2D - from matplotlib.backends.backend_mixed import MixedModeRenderer - -import numpy as np -import binascii -import re try: set except NameError: from sets import Set as set backend_version = 'Level II' - debugPS = 0 - class PsBackendHelper(object): def __init__(self): diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py index 8298ae3..095cf60 100644 --- a/lib/matplotlib/backends/backend_qt4.py +++ b/lib/matplotlib/backends/backend_qt4.py @@ -1,48 +1,16 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -import six -from six import unichr -import os -import re -import signal -import sys - -import matplotlib - -from matplotlib.cbook import is_string_like -from matplotlib.backend_bases import FigureManagerBase from matplotlib.backend_bases import FigureCanvasBase -from matplotlib.backend_bases import NavigationToolbar2 - -from matplotlib.backend_bases import cursors -from matplotlib.backend_bases import TimerBase -from matplotlib.backend_bases import ShowBase - -from matplotlib._pylab_helpers import Gcf from matplotlib.figure import Figure +from .qt_compat import QtCore, QtWidgets, __version__ -from matplotlib.widgets import SubplotTool -try: - import matplotlib.backends.qt_editor.figureoptions as figureoptions -except ImportError: - figureoptions = None - -from .qt_compat import QtCore, QtWidgets, _getSaveFileName, __version__ -from matplotlib.backends.qt_editor.formsubplottool import UiSubplotTool - -from .backend_qt5 import (backend_version, SPECIAL_KEYS, SUPER, ALT, CTRL, - SHIFT, MODIFIER_KEYS, fn_name, cursord, - draw_if_interactive, _create_qApp, show, TimerQT, - MainWindow, FigureManagerQT, NavigationToolbar2QT, - SubplotToolQt, error_msg_qt, exception_handler) - +from .backend_qt5 import (backend_version, _create_qApp, FigureManagerQT) from .backend_qt5 import FigureCanvasQT as FigureCanvasQT5 DEBUG = False - def new_figure_manager(num, *args, **kwargs): """ Create a new figure manager instance diff --git a/lib/matplotlib/backends/backend_qt4agg.py b/lib/matplotlib/backends/backend_qt4agg.py index fc20578..31ce686 100644 --- a/lib/matplotlib/backends/backend_qt4agg.py +++ b/lib/matplotlib/backends/backend_qt4agg.py @@ -4,29 +4,18 @@ Render to qt from agg from __future__ import (absolute_import, division, print_function, unicode_literals) -import six - -import os # not used import sys import ctypes -import warnings import matplotlib from matplotlib.figure import Figure - from .backend_qt5agg import FigureCanvasQTAggBase from .backend_agg import FigureCanvasAgg from .backend_qt4 import QtCore from .backend_qt4 import FigureManagerQT from .backend_qt4 import FigureCanvasQT -from .backend_qt4 import NavigationToolbar2QT -##### not used -from .backend_qt4 import show -from .backend_qt4 import draw_if_interactive -from .backend_qt4 import backend_version -###### DEBUG = False diff --git a/lib/matplotlib/backends/backend_qt5agg.py b/lib/matplotlib/backends/backend_qt5agg.py index 687f436..41f6a0c 100644 --- a/lib/matplotlib/backends/backend_qt5agg.py +++ b/lib/matplotlib/backends/backend_qt5agg.py @@ -4,8 +4,6 @@ Render to qt from agg from __future__ import (absolute_import, division, print_function, unicode_literals) -import six - import sys import ctypes @@ -15,15 +13,8 @@ from .backend_agg import FigureCanvasAgg from .backend_qt5 import QtCore from .backend_qt5 import QtGui from .backend_qt5 import FigureManagerQT -from .backend_qt5 import NavigationToolbar2QT ##### Modified Qt5 backend import from .backend_qt5 import FigureCanvasQT -##### not used -from .backend_qt5 import show -from .backend_qt5 import draw_if_interactive -from .backend_qt5 import backend_version -###### - DEBUG = False diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py index 4462c9b..e8ddf64 100644 --- a/lib/matplotlib/backends/backend_svg.py +++ b/lib/matplotlib/backends/backend_svg.py @@ -5,29 +5,27 @@ import six from six.moves import xrange from six import unichr -import os, base64, tempfile, gzip, io, sys, codecs, re +import base64, gzip, io, codecs, re import numpy as np from hashlib import md5 from matplotlib import verbose, __version__, rcParams -from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\ - FigureManagerBase, FigureCanvasBase +from matplotlib.backend_bases import (RendererBase, FigureManagerBase, + FigureCanvasBase) from matplotlib.backends.backend_mixed import MixedModeRenderer from matplotlib.cbook import is_string_like, is_writable_file_like, maxdict from matplotlib.colors import rgb2hex from matplotlib.figure import Figure -from matplotlib.font_manager import findfont, FontProperties -from matplotlib.ft2font import FT2Font, KERNING_DEFAULT, LOAD_NO_HINTING +from matplotlib.font_manager import findfont +from matplotlib.ft2font import FT2Font, LOAD_NO_HINTING from matplotlib.mathtext import MathTextParser from matplotlib.path import Path from matplotlib import _path from matplotlib.transforms import Affine2D, Affine2DBase from matplotlib import _png -from xml.sax.saxutils import escape as escape_xml_text - backend_version = __version__ # ---------------------------------------------------------------------- diff --git a/lib/matplotlib/backends/backend_template.py b/lib/matplotlib/backends/backend_template.py index f3e483d..91b25c2 100644 --- a/lib/matplotlib/backends/backend_template.py +++ b/lib/matplotlib/backends/backend_template.py @@ -65,15 +65,11 @@ Naming Conventions from __future__ import (absolute_import, division, print_function, unicode_literals) -import six - import matplotlib from matplotlib._pylab_helpers import Gcf from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\ FigureManagerBase, FigureCanvasBase from matplotlib.figure import Figure -from matplotlib.transforms import Bbox - class RendererTemplate(RendererBase): """ diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py index 8ffc8a8..8dc934b 100644 --- a/lib/matplotlib/backends/backend_tkagg.py +++ b/lib/matplotlib/backends/backend_tkagg.py @@ -4,7 +4,6 @@ from __future__ import (absolute_import, division, print_function, import six from six.moves import tkinter as Tk -from six.moves import tkinter_filedialog as FileDialog import os, sys, math import os.path @@ -17,25 +16,19 @@ import matplotlib.backends.windowing as windowing import matplotlib from matplotlib.cbook import is_string_like -from matplotlib.backend_bases import RendererBase, GraphicsContextBase -from matplotlib.backend_bases import FigureManagerBase, FigureCanvasBase -from matplotlib.backend_bases import NavigationToolbar2, cursors, TimerBase -from matplotlib.backend_bases import (ShowBase, ToolContainerBase, +from matplotlib.backend_bases import (FigureManagerBase, FigureCanvasBase, + NavigationToolbar2, cursors, TimerBase, + ShowBase, ToolContainerBase, StatusbarBase) from matplotlib.backend_managers import ToolManager from matplotlib import backend_tools from matplotlib._pylab_helpers import Gcf - from matplotlib.figure import Figure - from matplotlib.widgets import SubplotTool -import matplotlib.cbook as cbook - rcParams = matplotlib.rcParams verbose = matplotlib.verbose - backend_version = Tk.TkVersion # the true dots per inch on the screen; should be display dependent diff --git a/lib/matplotlib/backends/backend_webagg.py b/lib/matplotlib/backends/backend_webagg.py index fe03107..0e0a225 100644 --- a/lib/matplotlib/backends/backend_webagg.py +++ b/lib/matplotlib/backends/backend_webagg.py @@ -15,7 +15,6 @@ from __future__ import (absolute_import, division, print_function, import six -import datetime import errno import json import os diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py index 849b3de..aacd727 100644 --- a/lib/matplotlib/backends/backend_webagg_core.py +++ b/lib/matplotlib/backends/backend_webagg_core.py @@ -13,12 +13,9 @@ Displays Agg images in the browser, with interactivity from __future__ import (absolute_import, division, print_function, unicode_literals) -import six - import io import json import os -import time import warnings import numpy as np @@ -28,7 +25,6 @@ from matplotlib.figure import Figure from matplotlib import backend_bases from matplotlib import _png - def new_figure_manager(num, *args, **kwargs): """ Create a new figure manager instance diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py index 81f41d7..da08a41 100644 --- a/lib/matplotlib/backends/backend_wx.py +++ b/lib/matplotlib/backends/backend_wx.py @@ -28,8 +28,6 @@ import warnings import numpy as np -from matplotlib.cbook import mplDeprecation - # Debugging settings here... # Debug level set here. If the debug level is less than 5, information # messages (progressively more info for lower value) are printed. In addition, diff --git a/lib/matplotlib/backends/backend_wxagg.py b/lib/matplotlib/backends/backend_wxagg.py index 5dd0103..f1d8c3c 100644 --- a/lib/matplotlib/backends/backend_wxagg.py +++ b/lib/matplotlib/backends/backend_wxagg.py @@ -1,19 +1,16 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -import six - import matplotlib from matplotlib.figure import Figure from .backend_agg import FigureCanvasAgg from . import backend_wx # already uses wxversion.ensureMinimal('2.8') -from .backend_wx import FigureManagerWx, FigureCanvasWx, \ - FigureFrameWx, DEBUG_MSG, NavigationToolbar2Wx, error_msg_wx, \ - draw_if_interactive, show, Toolbar, backend_version +from .backend_wx import (FigureManagerWx, FigureCanvasWx, + FigureFrameWx, DEBUG_MSG, NavigationToolbar2Wx, + draw_if_interactive, backend_version) import wx - class FigureFrameWxAgg(FigureFrameWx): def get_canvas(self, fig): return FigureCanvasWxAgg(self, -1, fig) diff --git a/lib/matplotlib/backends/tkagg.py b/lib/matplotlib/backends/tkagg.py index 81fe926..fa16b67 100644 --- a/lib/matplotlib/backends/tkagg.py +++ b/lib/matplotlib/backends/tkagg.py @@ -1,11 +1,8 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -import six from six.moves import tkinter as Tk - import numpy as np - from matplotlib.backends import _tkagg def blit(photoimage, aggimage, bbox=None, colormode=1): diff --git a/lib/matplotlib/backends/windowing.py b/lib/matplotlib/backends/windowing.py index 6c2e495..1b99fd6 100644 --- a/lib/matplotlib/backends/windowing.py +++ b/lib/matplotlib/backends/windowing.py @@ -9,8 +9,6 @@ It uses a tiny C++ extension module to access MS Win functions. from __future__ import (absolute_import, division, print_function, unicode_literals) -import six - from matplotlib import rcParams try: -- 2.1.4 |