Issue #28896: Deprecate WindowsRegistryFinder

(grafted from 25df9671663b5f8b1560d58d8842f9676f6dffc2)

diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 8210a2f17093d643c55c04ab3d42c24775467180..1fd56983d0a9e911082d6106dfe0e577c2d73f31 100644 (file)
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -806,6 +806,10 @@ find and load modules.
 
    .. 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 81efbb0c985b5db9a3789fd5be5454e0bfbe7f54..3e4b70e8a17ef7ee8671ae14174b7246393ee9c0 100644 (file)
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -823,6 +823,14 @@ non-standard paths in the registry and user site-packages.
       * 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 527e7429b1e6e65ea5eb87f3787c6fb3f90e8fb1..ddca2ef8ca328e394b96305b158554f7fe3cdaba 100644 (file)
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -1938,6 +1938,10 @@ are now deprecated. They were the only remaining implementations of
 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 770c8a9623faefcd450d9159ff7d8193ea4834b0..bab6558e12a529371f4bca3d2d88951536b17260 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,6 +2,17 @@
 Python News
 +++++++++++
 
+What's New in Python 3.6.0 release candidate 2
+==============================================
+
+*Release date: XXXX-XX-XX*
+
+Windows
+-------
+
+- Issue #28896: Deprecate WindowsRegistryFinder
+
+
 What's New in Python 3.6.0 release candidate 1
 ==============================================