Merge from 3.5

This commit is contained in:
Berker Peksag 2016-06-11 22:38:57 +03:00
commit d1f534065c
1 changed files with 3 additions and 3 deletions

View File

@ -283,9 +283,9 @@ library/xml.etree.elementtree,301,:character,<fictional:character>Archie Leach</
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"

1 c-api/arg :ref PyArg_ParseTuple(args, "O|O:ref", &object, &callback)
283 library/xml.etree.elementtree 301 :character <fictional:character>Sir Robin</fictional:character>
284 library/xml.etree.elementtree 301 :character <fictional:character>Gunther</fictional:character>
285 library/xml.etree.elementtree 301 :character <fictional:character>Commander Clement</fictional:character>
286 library/xml.etree.elementtree 332 :actor for actor in root.findall('real_person:actor', ns):
287 library/xml.etree.elementtree 332 :name name = actor.find('real_person:name', ns)
288 library/xml.etree.elementtree 332 :character for char in actor.findall('role:character', ns):
289 library/zipapp 31 :main $ python -m zipapp myapp -m "myapp:main"
290 library/zipapp 82 :fn argument should have the form "pkg.mod:fn", where "pkg.mod" is a
291 library/zipapp 155 :callable "pkg.module:callable" and the archive will be run by importing