mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge documentation for issue #27030 from 3.6.

Browse source
This commit is contained in:
Serhiy Storchaka 2016-12-06 19:25:19 +02:00
commit ff3dbe9141
4 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Doc/library/re.rst
View file

@ -758,7 +758,12 @@ form.
Unmatched groups are replaced with an empty string. Unmatched groups are replaced with an empty string.
.. versionchanged:: 3.6 .. 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) .. function:: subn(pattern, repl, string, count=0, flags=0)

5
Doc/whatsnew/3.6.rst
View file

@ -2021,8 +2021,9 @@ API and Feature Removals
------------------------ ------------------------
* Unknown escapes consisting of ``'\'`` and an ASCII letter in * Unknown escapes consisting of ``'\'`` and an ASCII letter in
regular expressions will now cause an error. The :const:`re.LOCALE` regular expressions will now cause an error. In replacement templates for
flag can now only be used with binary patterns. :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). * ``inspect.getmoduleinfo()`` was removed (was deprecated since CPython 3.3).
:func:`inspect.getmodulename` should be used for obtaining the module :func:`inspect.getmodulename` should be used for obtaining the module

5
Doc/whatsnew/3.7.rst
View file

@ -116,6 +116,11 @@ Deprecated
Removed 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 Porting to Python 3.7

3
Misc/NEWS
View file

@ -165,6 +165,9 @@ Core and Builtins
Library 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(): - Issue #28835: Fix a regression introduced in warnings.catch_warnings():
call warnings.showwarning() if it was overriden inside the context manager. call warnings.showwarning() if it was overriden inside the context manager.