summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2014-10-06 02:03:48 (GMT)
committerLarry Hastings <larry@hastings.org>2014-10-06 02:03:48 (GMT)
commitc6256e5f7da7be4566e918114b3a162c613c6ab2 (patch)
tree9b617bf0634151d6eb7525b04997399b16616586 /Doc
parente796b9e477f50318edab506d3565c0122c2e2c60 (diff)
downloadcpython-c6256e5f7da7be4566e918114b3a162c613c6ab2.zip
cpython-c6256e5f7da7be4566e918114b3a162c613c6ab2.tar.gz
cpython-c6256e5f7da7be4566e918114b3a162c613c6ab2.tar.bz2
Update pydoc topics and fix supsicious markup for 3.4.2 final.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/stdtypes.rst4
-rw-r--r--Doc/tools/sphinxext/susp-ignored.csv10
2 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 2dd57bc..d81d276 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1864,7 +1864,7 @@ expression support in the :mod:`re` module).
For example::
>>> 'ab c\n\nde fg\rkl\r\n'.splitlines()
- ['ab c', '', 'de fg', 'kl']``
+ ['ab c', '', 'de fg', 'kl']
>>> 'ab c\n\nde fg\rkl\r\n'.splitlines(keepends=True)
['ab c\n', '\n', 'de fg\r', 'kl\r\n']
@@ -2932,7 +2932,7 @@ place, and instead produce new objects.
For example::
>>> b'ab c\n\nde fg\rkl\r\n'.splitlines()
- [b'ab c', b'', b'de fg', b'kl']``
+ [b'ab c', b'', b'de fg', b'kl']
>>> b'ab c\n\nde fg\rkl\r\n'.splitlines(keepends=True)
[b'ab c\n', b'\n', b'de fg\r', b'kl\r\n']
diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
index 1769023..48653af8 100644
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -256,11 +256,6 @@ whatsnew/2.4,,:System,
whatsnew/2.5,,:memory,:memory:
whatsnew/2.5,,:step,[start:stop:step]
whatsnew/2.5,,:stop,[start:stop:step]
-whatsnew/2.7,1619,::,"ParseResult(scheme='http', netloc='[1080::8:800:200C:417A]',"
-whatsnew/2.7,1619,::,>>> urlparse.urlparse('http://[1080::8:800:200C:417A]/foo')
-whatsnew/2.7,735,:Sunday,'2009:4:Sunday'
-whatsnew/2.7,862,:Cookie,"export PYTHONWARNINGS=all,error:::Cookie:0"
-whatsnew/2.7,862,::,"export PYTHONWARNINGS=all,error:::Cookie:0"
whatsnew/3.2,,:affe,"netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',"
whatsnew/3.2,,:affe,>>> urllib.parse.urlparse('http://[dead:beef:cafe:5417:affe:8FA3:deaf:feed]/foo/')
whatsnew/3.2,,:beef,"netloc='[dead:beef:cafe:5417:affe:8FA3:deaf:feed]',"
@@ -282,3 +277,8 @@ whatsnew/changelog,,:PythonCmd,"With Tk < 8.5 _tkinter.c:PythonCmd() raised Unic
whatsnew/changelog,,::,": Fix FTP tests for IPv6, bind to ""::1"" instead of ""localhost""."
whatsnew/changelog,,::,": Use ""127.0.0.1"" or ""::1"" instead of ""localhost"" as much as"
whatsnew/changelog,,:password,user:password
+whatsnew/2.7,780,:Sunday,'2009:4:Sunday'
+whatsnew/2.7,907,::,"export PYTHONWARNINGS=all,error:::Cookie:0"
+whatsnew/2.7,907,:Cookie,"export PYTHONWARNINGS=all,error:::Cookie:0"
+whatsnew/2.7,1657,::,>>> urlparse.urlparse('http://[1080::8:800:200C:417A]/foo')
+whatsnew/2.7,1657,::,"ParseResult(scheme='http', netloc='[1080::8:800:200C:417A]',"