[Python-checkins] cpython (merge 3.4 -> 3.5): Merge with 3.4

[zach.ware]

https://hg.python.org/cpython/rev/15b0ea7134da
changeset:   99064:15b0ea7134da
branch:      3.5
parent:      99060:81cc0cea2323
parent:      99063:b13960fc5fd4
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Wed Nov 11 23:33:50 2015 -0600
summary:
  Merge with 3.4

files:
  Doc/library/re.rst |  14 ++++++++------
  1 files changed, 8 insertions(+), 6 deletions(-)


diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -556,13 +556,15 @@
 .. data:: X
           VERBOSE
 
-   This flag allows you to write regular expressions that look nicer. Whitespace
-   within the pattern is ignored, except when in a character class or preceded by
-   an unescaped backslash, and, when a line contains a ``'#'`` neither in a
-   character class or preceded by an unescaped backslash, all characters from the
-   leftmost such ``'#'`` through the end of the line are ignored.
+   This flag allows you to write regular expressions that look nicer and are
+   more readable by allowing you to visually separate logical sections of the
+   pattern and add comments. Whitespace within the pattern is ignored, except
+   when in a character class or when preceded by an unescaped backslash.
+   When a line contains a ``#`` that is not in a character class and is not
+   preceded by an unescaped backslash, all characters from the leftmost such
+   ``#`` through the end of the line are ignored.
 
-   That means that the two following regular expression objects that match a
+   This means that the two following regular expression objects that match a
    decimal number are functionally equal::
 
       a = re.compile(r"""\d +  # the integral part

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