Merge 3.5

This commit is contained in:
Zachary Ware 2015-07-07 00:34:37 -05:00
commit 9f20bdb321
1 changed files with 1 additions and 1 deletions

View File

@ -289,5 +289,5 @@ 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,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/zipapp,155,:callable,"""pkg.module:callable"" and the archive will be run by importing"
library/stdtypes,3767,::,>>> m[::2].tolist() library/stdtypes,3767,::,>>> m[::2].tolist()
library/sys,1115,`,# `wrapper` creates a `wrap(coro)` coroutine: 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)" tutorial/venv,77,:c7b9645a6f35,"Python 3.4.3+ (3.4:c7b9645a6f35+, May 22 2015, 09:31:25)"

1 c-api/arg :ref PyArg_ParseTuple(args, "O|O:ref", &object, &callback)
289 library/zipapp 82 :fn argument should have the form "pkg.mod:fn", where "pkg.mod" is a
290 library/zipapp 155 :callable "pkg.module:callable" and the archive will be run by importing
291 library/stdtypes 3767 :: >>> m[::2].tolist()
292 library/sys 1115 ` # `wrapper` creates a `wrap(coro)` coroutine: # ``wrapper`` creates a ``wrap(coro)`` coroutine:
293 tutorial/venv 77 :c7b9645a6f35 Python 3.4.3+ (3.4:c7b9645a6f35+, May 22 2015, 09:31:25)