summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRam Rachum <ram@rachum.com>2020-03-25 20:44:47 +0200
committerGitHub <noreply@github.com>2020-03-25 14:44:47 -0400
commit89a2209ae6fc5f39868621799730e16f931eb497 (patch)
treede3090d82ffb4fbd716925c1c325dfe54b8e949b
parent87d3b9db4ade1aa100ee6f065082cb7e85b8992f (diff)
downloadcpython-git-89a2209ae6fc5f39868621799730e16f931eb497.tar.gz
bpo-40016: re docstring: Clarify relationship of inline and argument flags (#19078)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
-rw-r--r--Lib/re.py6
-rw-r--r--Misc/NEWS.d/next/Library/2020-03-19-19-40-27.bpo-40016.JWtxqJ.rst1
2 files changed, 5 insertions, 2 deletions
diff --git a/Lib/re.py b/Lib/re.py
index 8f1d55ddf7..bfb7b1ccd9 100644
--- a/Lib/re.py
+++ b/Lib/re.py
@@ -44,7 +44,7 @@ The special characters are:
"|" A|B, creates an RE that will match either A or B.
(...) Matches the RE inside the parentheses.
The contents can be retrieved or matched later in the string.
- (?aiLmsux) Set the A, I, L, M, S, U, or X flag for the RE (see below).
+ (?aiLmsux) The letters set the corresponding flags defined below.
(?:...) Non-grouping version of regular parentheses.
(?P<name>...) The substring matched by the group is accessible by name.
(?P=name) Matches the text matched earlier by the group named name.
@@ -97,7 +97,9 @@ This module exports the following functions:
purge Clear the regular expression cache.
escape Backslash all non-alphanumerics in a string.
-Some of the functions in this module takes flags as optional parameters:
+Each function other than purge and escape can take an optional 'flags' argument
+consisting of one or more of the following module constants, joined by "|".
+A, L, and U are mutually exclusive.
A ASCII For string patterns, make \w, \W, \b, \B, \d, \D
match the corresponding ASCII character categories
(rather than the whole Unicode categories, which is the
diff --git a/Misc/NEWS.d/next/Library/2020-03-19-19-40-27.bpo-40016.JWtxqJ.rst b/Misc/NEWS.d/next/Library/2020-03-19-19-40-27.bpo-40016.JWtxqJ.rst
new file mode 100644
index 0000000000..0c6449de52
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-03-19-19-40-27.bpo-40016.JWtxqJ.rst
@@ -0,0 +1 @@
+In re docstring, clarify the relationship between inline and argument compile flags. \ No newline at end of file