diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-10-04 17:09:49 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 17:09:49 (GMT) |
| commit | 0b5e61ddca73ad4fe597fb15065115b0285c8849 (patch) | |
| tree | 67819288e77e0c1835ab7e04af83f741e77cfea8 /Lib/telnetlib.py | |
| parent | 8d5a3aad2f805dc0ea40829b751f58aa6c75305d (diff) | |
| download | cpython-0b5e61ddca73ad4fe597fb15065115b0285c8849.zip cpython-0b5e61ddca73ad4fe597fb15065115b0285c8849.tar.gz cpython-0b5e61ddca73ad4fe597fb15065115b0285c8849.tar.bz2 | |
bpo-30397: Add re.Pattern and re.Match. (#1646)
Diffstat (limited to 'Lib/telnetlib.py')
| -rw-r--r-- | Lib/telnetlib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py index b0863b1..b9d45b4 100644 --- a/Lib/telnetlib.py +++ b/Lib/telnetlib.py @@ -585,12 +585,12 @@ class Telnet: """Read until one from a list of a regular expressions matches. The first argument is a list of regular expressions, either - compiled (re.RegexObject instances) or uncompiled (strings). + compiled (re.Pattern instances) or uncompiled (strings). The optional second argument is a timeout, in seconds; default is no timeout. Return a tuple of three items: the index in the list of the - first regular expression that matches; the match object + first regular expression that matches; the re.Match object returned; and the text read up till and including the match. If EOF is read and no text was read, raise EOFError. |