[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/05110cde7417
changeset:   101883:05110cde7417
parent:      101881:bc758c62bc4f
parent:      101882:c48a411e7aa1
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Sat Jun 11 22:38:57 2016 +0300
summary:
  Merge from 3.5

files:
  Doc/tools/susp-ignored.csv |  6 +++---
  1 files changed, 3 insertions(+), 3 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
@@ -283,9 +283,9 @@
 library/xml.etree.elementtree,301,:character,<fictional:character>Sir Robin</fictional:character>
 library/xml.etree.elementtree,301,:character,<fictional:character>Gunther</fictional:character>
 library/xml.etree.elementtree,301,:character,<fictional:character>Commander Clement</fictional:character>
-library/xml.etree.elementtree,332,:actor,"for actor in root.findall('real_person:actor', ns):"
-library/xml.etree.elementtree,332,:name,"name = actor.find('real_person:name', ns)"
-library/xml.etree.elementtree,332,:character,"for char in actor.findall('role:character', ns):"
+library/xml.etree.elementtree,,:actor,"for actor in root.findall('real_person:actor', ns):"
+library/xml.etree.elementtree,,:name,"name = actor.find('real_person:name', ns)"
+library/xml.etree.elementtree,,:character,"for char in actor.findall('role:character', ns):"
 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"

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