Merge pull request #12043 from anntzer/py2exe

jklymak · web-flow · commit 256e49eb89e4 · 2018-09-06T14:32:34.000-07:00
Deprecate get_py2exe_datafiles.
diff --git a/doc/api/next_api_changes/2018-08-17-AL-deprecations.rst b/doc/api/next_api_changes/2018-08-17-AL-deprecations.rst
@@ -3,7 +3,7 @@ API deprecations
 
 The following API elements are deprecated:
 
-- ``tk_window_focus``,
+- ``get_py2exe_datafiles``, ``tk_window_focus``,
 - ``backend_ps.PsBackendHelper``, ``backend_ps.ps_backend_helper``,
 - ``cbook.iterable``,
 - ``mlab.demean``,
diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst
@@ -606,8 +606,8 @@ Write a tutorial on the signal analysis plotting functions like
 :func:`~matplotlib.pyplot.specgram`.  Do you use Matplotlib with
 `django <https://www.djangoproject.com/>`_ or other popular web
 application servers?  Write a FAQ or tutorial and we'll find a place
-for it in the :ref:`users-guide-index`.  Bundle Matplotlib in a
-`py2exe <http://www.py2exe.org/>`_ app?  ... I think you get the idea.
+for it in the :ref:`users-guide-index`.  And so on...  I think you get the
+idea.
 
 Matplotlib is documented using the `sphinx
 <http://www.sphinx-doc.org/index.html>`_ extensions to restructured text
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -682,6 +682,7 @@ def get_data_path():
     return defaultParams['datapath'][0]
 
 
+@cbook.deprecated("3.1")
 def get_py2exe_datafiles():
     data_path = Path(get_data_path())
     d = {}
