Issue #28896: Deprecate WindowsRegistryFinder
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 8210a2f..1fd5698 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -806,6 +806,10 @@
.. versionadded:: 3.3
+ .. deprecated:: 3.6
+ Use :mod:`site` configuration instead. Future versions of Python may
+ not enable this finder by default.
+
.. class:: PathFinder
diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index 81efbb0..3e4b70e 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -823,6 +823,14 @@
* Adds ``pythonXX.zip`` as a potential landmark when directly adjacent
to the executable.
+.. deprecated::
+ 3.6
+
+ Modules specified in the registry under ``Modules`` (not ``PythonPath``)
+ may be imported by :class:`importlib.machinery.WindowsRegistryFinder`.
+ This finder is enabled on Windows in 3.6.0 and earlier, but may need to
+ be explicitly added to :attr:`sys.meta_path` in the future.
+
Additional modules
==================
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index 527e742..ddca2ef 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -1938,6 +1938,10 @@
been deprecated in previous versions of Python in favour of
:meth:`importlib.abc.Loader.exec_module`.
+The :class:`importlib.machinery.WindowsRegistryFinder` class is now
+deprecated. As of 3.6.0, it is still added to :attr:`sys.meta_path` by
+default (on Windows), but this may change in future releases.
+
os
~~
diff --git a/Misc/NEWS b/Misc/NEWS
index a15bb9b..deb1549 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,11 @@
- Issue #28847: dbm.dumb now supports reading read-only files and no longer
writes the index file when it is not changed.
+Windows
+-------
+
+- Issue #28896: Deprecate WindowsRegistryFinder
+
Tests
-----