From 5dc1fb3eda58fd01b47e7b3bba7ce1dff226054a Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 7 Dec 2016 13:02:27 -0800
Subject: Issue #28896: Deprecate WindowsRegistryFinder (grafted from
 25df9671663b5f8b1560d58d8842f9676f6dffc2)

---
 Doc/library/importlib.rst |  4 ++++
 Doc/using/windows.rst     |  8 ++++++++
 Doc/whatsnew/3.6.rst      |  4 ++++
 Misc/NEWS                 | 11 +++++++++++
 4 files changed, 27 insertions(+)

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 @@ 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 81efbb0..3e4b70e 100644
--- 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 527e742..ddca2ef 100644
--- 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 770c8a9..bab6558 100644
--- 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
 ==============================================
 
-- 
cgit v0.12