[Python-checkins] cpython (merge 3.5 -> default): Issue #23406: Merge 3.5 into 3.6

[martin.panter]

https://hg.python.org/cpython/rev/48f1e9a47301
changeset:   97723:48f1e9a47301
parent:      97719:d2b3c7c5ef02
parent:      97721:2640a4630e9e
user:        Martin Panter <vadmium>
date:        Mon Sep 07 04:05:57 2015 +0000
summary:
  Issue #23406: Merge 3.5 into 3.6

files:
  Doc/tools/susp-ignored.csv |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tools/susp-ignored.csv b/Doc/tools/susp-ignored.csv
--- a/Doc/tools/susp-ignored.csv
+++ b/Doc/tools/susp-ignored.csv
@@ -288,6 +288,6 @@
 library/zipapp,31,:main,"$ python -m zipapp myapp -m ""myapp:main"""
 library/zipapp,82,:fn,"argument should have the form ""pkg.mod:fn"", where ""pkg.mod"" is a"
 library/zipapp,155,:callable,"""pkg.module:callable"" and the archive will be run by importing"
-library/stdtypes,3767,::,>>> m[::2].tolist()
+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)"

-- 
Repository URL: https://hg.python.org/cpython