8000 Move deprecation as suggested by @OceanWolf · matplotlib/matplotlib@90c4f60 · GitHub
[go: up one dir, main page]
Skip to content

Commit 90c4f60

Browse files
jenshnielsenjenshnielsen
committed
Move deprecation as suggested by @OceanWolf 
1 parent 4e302b7 commit 90c4f60

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

‎lib/matplotlib/backends/backend_gdk.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -434,19 +434,18 @@ def new_figure_manager_given_figure(num, figure):
434434
class FigureCanvasGDK (FigureCanvasBase):
435435
def __init__(self, figure):
436436
FigureCanvasBase.__init__(self, figure)
437-
437+
if self.__class__ == matplotlib.backends.backend_gdk.FigureCanvasGDK:
438+
warn_deprecated('2.0', message="The GDK backend is "
439+
"deprecated. It is untested, known to be "
440+
"broken and will be removed in Matplotlib 2.2. "
441+
"Use the Agg backend instead.",
442+
alternative="Agg")
438443
self._renderer_init()
439444

440445
def _renderer_init(self):
441446
self._renderer = RendererGDK (gtk.DrawingArea(), self.figure.dpi)
442447

443448
def _render_figure(self, pixmap, width, height):
444-
if isinstance(self._renderer, RendererGDK):
445-
warn_deprecated('2.0', message="The GDK backend is "
446-
"deprecated. It is untested, known to be "
447-
"broken and will be removed in Matplotlib 2.2. "
448-
"Use the Agg backend instead.",
449-
alternative="Agg")
450449
self._renderer.set_pixmap (pixmap)
451450
self._renderer.set_width_height (width, height)
452451
self.figure.draw (self._renderer)

‎lib/matplotlib/backends/backend_gtk.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,12 @@ class FigureCanvasGTK (gtk.DrawingArea, FigureCanvasBase):
213213
gdk.POINTER_MOTION_HINT_MASK)
214214

215215
def __init__(self, figure):
216+
if self.__class__ == matplotlib.backends.backend_gtk.FigureCanvasGTK:
217+
warn_deprecated('2.0', message="The GTK backend is "
218+
"deprecated. It is untested, known to be "
219+
"broken and will be removed in Matplotlib 2.2. "
220+
"Use the GTKAgg backend instead.",
221+
alternative="GTKAgg")
216222
if _debug: print('FigureCanvasGTK.%s' % fn_name())
217223
FigureCanvasBase.__init__(self, figure)
218224
gtk.DrawingArea.__init__(self)
@@ -419,12 +425,6 @@ def _pixmap_prepare(self, width, height):
419425
def _render_figure(self, pixmap, width, height):
420426
"""used by GTK and GTKcairo. GTKAgg overrides
421427
"""
422-
if isinstance(self._renderer, RendererGDK):
423-
warn_deprecated('2.0', message="The GTK backend is "
424-
"deprecated. It is untested, known to be "
425-
"broken and will be removed in Matplotlib 2.2. "
426-
"Use the GTKAgg backend instead.",
427-
alternative="GTKAgg")
428428
self._renderer.set_width_height (width, height)
429429
self.figure.draw (self._renderer)
430430

0 commit comments

Comments
 (0)
0