[Python-checkins] cpython (merge 3.6 -> default): Merge documentation for issue #27030 from 3.6.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/5904d2ced3d8
changeset:   105483:5904d2ced3d8
parent:      105481:e6ad41a3f3bd
parent:      105482:1b162d6e3d01
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Tue Dec 06 19:25:19 2016 +0200
summary:
  Merge documentation for issue #27030 from 3.6.

files:
  Doc/library/re.rst   |  7 ++++++-
  Doc/whatsnew/3.6.rst |  5 +++--
  Doc/whatsnew/3.7.rst |  5 +++++
  Misc/NEWS            |  3 +++
  4 files changed, 17 insertions(+), 3 deletions(-)


diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -758,7 +758,12 @@
       Unmatched groups are replaced with an empty string.
 
    .. versionchanged:: 3.6
-      Unknown escapes consisting of ``'\'`` and an ASCII letter now are errors.
+      Unknown escapes in *pattern* consisting of ``'\'`` and an ASCII letter
+      now are errors.
+
+   .. versionchanged:: 3.7
+      Unknown escapes in *repl* consisting of ``'\'`` and an ASCII letter
+      now are errors.
 
 
 .. function:: subn(pattern, repl, string, count=0, flags=0)
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -2021,8 +2021,9 @@
 ------------------------
 
 * Unknown escapes consisting of ``'\'`` and an ASCII letter in
-  regular expressions will now cause an error.  The :const:`re.LOCALE`
-  flag can now only be used with binary patterns.
+  regular expressions will now cause an error.  In replacement templates for
+  :func:`re.sub` they are still allowed, but deprecated.
+  The :const:`re.LOCALE` flag can now only be used with binary patterns.
 
 * ``inspect.getmoduleinfo()`` was removed (was deprecated since CPython 3.3).
   :func:`inspect.getmodulename` should be used for obtaining the module
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -116,6 +116,11 @@
 Removed
 =======
 
+API and Feature Removals
+------------------------
+
+* Unknown escapes consisting of ``'\'`` and an ASCII letter in replacement
+  templates for :func:`re.sub` will now cause an error.
 
 
 Porting to Python 3.7
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -165,6 +165,9 @@
 Library
 -------
 
+- Issue #27030: Unknown escapes consisting of ``'\'`` and an ASCII letter in
+  re.sub() replacement templates regular expressions now are errors.
+
 - Issue #28835: Fix a regression introduced in warnings.catch_warnings():
   call warnings.showwarning() if it was overriden inside the context manager.
 

-- 
Repository URL: https://hg.python.org/cpython