summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-06-08 11:57:24 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-06-08 11:57:24 (GMT)
commit3c923eac4d88ef4714418aad691e0eaedf0afb47 (patch)
tree6e75d028bfda0807418a8c43ba3c4db6c72235c5
parent40de69ac588cece85fd3ed7fad06cdfdaf8f5e6a (diff)
parent84f387d420fd908973cf9660f91b448d7e848b42 (diff)
downloadcpython-3c923eac4d88ef4714418aad691e0eaedf0afb47.zip
cpython-3c923eac4d88ef4714418aad691e0eaedf0afb47.tar.gz
cpython-3c923eac4d88ef4714418aad691e0eaedf0afb47.tar.bz2
Issue #21593: Merge from 3.5
-rw-r--r--Doc/library/re.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 82beba1..ceb7959 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -811,8 +811,8 @@ attributes:
.. method:: regex.search(string[, pos[, endpos]])
- Scan through *string* looking for a location where this regular expression
- produces a match, and return a corresponding :ref:`match object
+ Scan through *string* looking for the first location where this regular
+ expression produces a match, and return a corresponding :ref:`match object
<match-objects>`. Return ``None`` if no position in the string matches the
pattern; note that this is different from finding a zero-length match at some
point in the string.