summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2015-10-02 20:29:13 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2015-10-02 20:29:13 (GMT)
commit4b5d8018dfc32a6edc73339787ed4530749ea90c (patch)
treea412751ef82c21835abdae09b3e5d5f52ccb024c /Doc
parentd7639098859ae28027db93100e261c456c444d11 (diff)
parent8214a7c38f1057bfe5c32d24406a6511529867fd (diff)
downloadcpython-4b5d8018dfc32a6edc73339787ed4530749ea90c.zip
cpython-4b5d8018dfc32a6edc73339787ed4530749ea90c.tar.gz
cpython-4b5d8018dfc32a6edc73339787ed4530749ea90c.tar.bz2
Merge from 3.5
Hg: --
Diffstat (limited to 'Doc')
-rw-r--r--Doc/tools/susp-ignored.csv10
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
index 6e9ded3..f7c3bde 100644
--- a/Doc/tools/susp-ignored.csv
+++ b/Doc/tools/susp-ignored.csv
@@ -290,8 +290,8 @@ library/zipapp,155,:callable,"""pkg.module:callable"" and the archive will be ru
library/stdtypes,,::,>>> m[::2].tolist()
library/sys,1115,`,# ``wrapper`` creates a ``wrap(coro)`` coroutine:
tutorial/venv,77,:c7b9645a6f35,"Python 3.4.3+ (3.4:c7b9645a6f35+, May 22 2015, 09:31:25)"
-whatsnew/3.5,965,:root,'WARNING:root:warning\n'
-whatsnew/3.5,965,:warning,'WARNING:root:warning\n'
-whatsnew/3.5,1292,::,>>> addr6 = ipaddress.IPv6Address('::1')
-whatsnew/3.5,1354,:root,ERROR:root:exception
-whatsnew/3.5,1354,:exception,ERROR:root:exception
+whatsnew/3.5,,:root,'WARNING:root:warning\n'
+whatsnew/3.5,,:warning,'WARNING:root:warning\n'
+whatsnew/3.5,,::,>>> addr6 = ipaddress.IPv6Address('::1')
+whatsnew/3.5,,:root,ERROR:root:exception
+whatsnew/3.5,,:exception,ERROR:root:exception