diff options
| author | Christian Heimes <christian@cheimes.de> | 2013-12-02 19:02:04 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2013-12-02 19:02:04 (GMT) |
| commit | b8a3f581580cc6dc7dd9621bbb41c2b85414eaba (patch) | |
| tree | bb2a3e3e1adc43369f783d932c7189263eb11b5d /Doc | |
| parent | 48aae57996c89a5601534320fdd078da978fb7bb (diff) | |
| parent | 6de88b3107108d1d6cb8a1939caaad1d9b354db4 (diff) | |
| download | cpython-b8a3f581580cc6dc7dd9621bbb41c2b85414eaba.zip cpython-b8a3f581580cc6dc7dd9621bbb41c2b85414eaba.tar.gz cpython-b8a3f581580cc6dc7dd9621bbb41c2b85414eaba.tar.bz2 | |
merge
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/re.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/3.4.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/re.rst b/Doc/library/re.rst index fa6a9ce..9dc88528 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -801,7 +801,7 @@ attributes: >>> pattern.fullmatch("dog") # No match as "o" is not at the start of "dog". >>> pattern.fullmatch("ogre") # No match as not the full string matches. >>> pattern.fullmatch("doggie", 1, 3) # Matches within given limits. - <_sre.SRE_Match object at ...> + <_sre.SRE_Match object; span=(1, 3), match='og'> .. versionadded:: 3.4 diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst index 301ab8f..5d360c4 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -742,7 +742,7 @@ TLSv1.1 and TLSv1.2 support. cert store. (Contributed by Christian Heimes in :issue:`18143`, :issue:`18147` and - :issue:`17134`.) +:issue:`17134`.) Support for server-side SNI using the new :meth:`ssl.SSLContext.set_servername_callback` method. |