Remove deprecated cocoaagg backend along with leftover refs to fltk

jenshnielsen · jenshnielsen · commit eb4b5b8df2fa · 2016-06-14T07:05:10.000+01:00
diff --git a/doc/users/screenshots.rst b/doc/users/screenshots.rst
@@ -279,7 +279,7 @@ rendering of strings with the *usetex* option.
 EEG demo
 =========
 
-You can embed matplotlib into pygtk, wx, Tk, FLTK, or Qt applications.
+You can embed matplotlib into pygtk, wx, Tk, or Qt applications.
 Here is a screenshot of an EEG viewer called `pbrain
 <http://github.com/nipy/pbrain>`__.
 
diff --git a/examples/README.txt b/examples/README.txt
@@ -38,6 +38,6 @@ directories found here:
   * units - working with unit data an custom types in matplotlib
 
   * user_interfaces - using matplotlib in a GUI application, e.g.,
-    TkInter, WXPython, pygtk, pyqt or FLTK widgets
+    TkInter, WXPython, pygtk, pyqt widgets
 
   * widgets - Examples using interactive widgets
diff --git a/examples/event_handling/test_mouseclicks.py b/examples/event_handling/test_mouseclicks.py
@@ -6,7 +6,6 @@
 #matplotlib.use("TkAgg")
 #matplotlib.use("GTKAgg")
 #matplotlib.use("Qt4Agg")
-#matplotlib.use("CocoaAgg")
 #matplotlib.use("MacOSX")
 import matplotlib.pyplot as plt
 
diff --git a/examples/user_interfaces/README.txt b/examples/user_interfaces/README.txt
@@ -3,11 +3,9 @@ Embedding matplotlib in graphical user interfaces
 
 You can embed matplotlib directly into a user interface application by
 following the embedding_in_SOMEGUI.py examples here.  Currently
-matplotlib supports wxpython, pygtk, tkinter, pyqt, fltk and cocoa.
+matplotlib supports wxpython, pygtk, tkinter and pyqt4/5.
 
 When embedding matplotlib in a GUI, you must use the matplotlib API
 directly rather than the pylab/pyplot proceedural interface, so take a
 look at the examples/api directory for some example code working with
 the API.
-
-
diff --git a/lib/matplotlib/backends/backend_cocoaagg.py b/lib/matplotlib/backends/backend_cocoaagg.py
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -37,12 +37,12 @@
 from cycler import Cycler, cycler as ccycler
 
 # interactive_bk = ['gtk', 'gtkagg', 'gtkcairo', 'qt4agg',
-#                  'tkagg', 'wx', 'wxagg', 'cocoaagg', 'webagg']
+#                  'tkagg', 'wx', 'wxagg', 'webagg']
 # The capitalized forms are needed for ipython at present; this may
 # change for later versions.
 
 interactive_bk = ['GTK', 'GTKAgg', 'GTKCairo', 'MacOSX',
-                  'Qt4Agg', 'Qt5Agg', 'TkAgg', 'WX', 'WXAgg', 'CocoaAgg',
+                  'Qt4Agg', 'Qt5Agg', 'TkAgg', 'WX', 'WXAgg',
                   'GTK3Cairo', 'GTK3Agg', 'WebAgg', 'nbAgg']
 
 
diff --git a/lib/matplotlib/tests/test_coding_standards.py b/lib/matplotlib/tests/test_coding_standards.py
@@ -221,7 +221,6 @@ def test_pep8_conformance_installed_files():
                           'backends/__init__.py',
                           'backends/backend_agg.py',
                           'backends/backend_cairo.py',
-                          'backends/backend_cocoaagg.py',
                           'backends/backend_gdk.py',
                           'backends/backend_gtk.py',
                           'backends/backend_gtk3.py',
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -30,7 +30,7 @@
 #### CONFIGURATION BEGINS HERE
 
 # The default backend; one of GTK GTKAgg GTKCairo GTK3Agg GTK3Cairo
-# CocoaAgg MacOSX Qt4Agg Qt5Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG
+# MacOSX Qt4Agg Qt5Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG
 # Template.
 # You can also deploy your own backend outside of matplotlib by
 # referring to the module name (which must be in the PYTHONPATH) as
diff --git a/setup.cfg.template b/setup.cfg.template
@@ -33,8 +33,8 @@
 #toolkits_tests = auto
 
 [gui_support]
-# Matplotlib supports multiple GUI toolkits, including Cocoa,
-# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
+# Matplotlib supports multiple GUI toolkits, including
+# GTK, MacOSX, Qt4, Qt5, Tk, and WX. Support for many of
 # these toolkits requires AGG, the Anti-Grain Geometry library,
 # which is provided by matplotlib and built by default.
 #
@@ -80,8 +80,8 @@
 [rc_options]
 # User-configurable options
 #
-# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo,
-# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
+# Default backend, one of: Agg, Cairo, GTK, GTKAgg, GTKCairo,
+# GTK3Agg, GTK3Cairo, MacOSX, Pdf, Ps, Qt4Agg, Qt5Agg, SVG, TkAgg, WX, WXAgg.
 #
 # The Agg, Ps, Pdf and SVG backends do not require external
 # dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, or TkAgg
