From: Serhiy Storchaka Date: Mon, 20 Nov 2017 17:17:59 +0000 (+0200) Subject: Merge branch 'master' into fix-issue-30688 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1113472faa669d5db366ef237a82b7a313f21f46;p=thirdparty%2FPython%2Fcpython.git Merge branch 'master' into fix-issue-30688 --- 1113472faa669d5db366ef237a82b7a313f21f46 diff --cc Doc/library/re.rst index 9fafc0f462d5,8c15462871b8..ca09a91c0d25 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@@ -443,15 -467,15 +467,15 @@@ character ``'$'`` Most of the standard escapes supported by Python string literals are also accepted by the regular expression parser:: - \a \b \f \n \N - \r \t \u \U - \v \x \\ + \a \b \f \n - \r \t \u \U - \v \x \\ ++ \N \r \t \u ++ \U \v \x \\ (Note that ``\b`` is used to represent word boundaries, and means "backspace" only inside character classes.) -``'\u'`` and ``'\U'`` escape sequences are only recognized in Unicode +``'\u'``, ``'\U'``, and ``'\N'`` escape sequences are only recognized in Unicode - patterns. In bytes patterns they are not treated specially. + patterns. In bytes patterns they are errors. Octal escapes are included in a limited form. If the first digit is a 0, or if there are three octal digits, it is considered an octal escape. Otherwise, it is