From 6a5c7c341ac654bda89b2d111aecb6d0a08fe6a2 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Wed, 31 Oct 2012 11:50:40 +0200 Subject: Fix docstring for deque ctor to mark iterable parameter optional --- Modules/_collectionsmodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 314bafd..54c1343 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -1019,7 +1019,7 @@ static PyMethodDef deque_methods[] = { }; PyDoc_STRVAR(deque_doc, -"deque(iterable[, maxlen]) --> deque object\n\ +"deque([iterable[, maxlen]]) --> deque object\n\ \n\ Build an ordered collection with optimized access from its endpoints."); -- cgit v0.12 From 4deb16dd7585582276714cae2d98b55db7fe6568 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Wed, 31 Oct 2012 12:02:56 +0200 Subject: Remove already dropped function PySys_GetFile from documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Daniel Müllner from docs@ --- Doc/c-api/sys.rst | 6 ------ Doc/data/refcounts.dat | 4 ---- 2 files changed, 10 deletions(-) diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst index 252bd1a..9760dca 100644 --- a/Doc/c-api/sys.rst +++ b/Doc/c-api/sys.rst @@ -61,12 +61,6 @@ accessible to C code. They all work with the current interpreter thread's Return the object *name* from the :mod:`sys` module or *NULL* if it does not exist, without setting an exception. -.. c:function:: FILE *PySys_GetFile(char *name, FILE *def) - - Return the :c:type:`FILE*` associated with the object *name* in the - :mod:`sys` module, or *def* if *name* is not in the module or is not associated - with a :c:type:`FILE*`. - .. c:function:: int PySys_SetObject(char *name, PyObject *v) Set *name* in the :mod:`sys` module to *v* unless *v* is *NULL*, in which diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat index c7d7bd1..b5dde33 100644 --- a/Doc/data/refcounts.dat +++ b/Doc/data/refcounts.dat @@ -1310,10 +1310,6 @@ PySys_AddWarnOption:char*:s:: PySys_AddXOption:void::: PySys_AddXOption:const wchar_t*:s:: -PySys_GetFile:FILE*::: -PySys_GetFile:char*:name:: -PySys_GetFile:FILE*:def:: - PySys_GetObject:PyObject*::0: PySys_GetObject:char*:name:: -- cgit v0.12 From e1fa22a8ae02f3321a0878456173d68922e78804 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Wed, 31 Oct 2012 16:03:14 +0200 Subject: Issue #16370: Mention Py_SetProgramName in example for very high level embedding. --- Doc/extending/embedding.rst | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst index d004d24..ccbe681 100644 --- a/Doc/extending/embedding.rst +++ b/Doc/extending/embedding.rst @@ -58,6 +58,7 @@ perform some operation on a file. :: int main(int argc, char *argv[]) { + Py_SetProgramName(argv[0]); /* optional but recommended */ Py_Initialize(); PyRun_SimpleString("from time import time,ctime\n" "print('Today is', ctime(time()))\n"); @@ -65,14 +66,18 @@ perform some operation on a file. :: return 0; } -The above code first initializes the Python interpreter with -:c:func:`Py_Initialize`, followed by the execution of a hard-coded Python script -that print the date and time. Afterwards, the :c:func:`Py_Finalize` call shuts -the interpreter down, followed by the end of the program. In a real program, -you may want to get the Python script from another source, perhaps a text-editor -routine, a file, or a database. Getting the Python code from a file can better -be done by using the :c:func:`PyRun_SimpleFile` function, which saves you the -trouble of allocating memory space and loading the file contents. +Function :c:func:`Py_SetProgramName` should be called before +:c:func:`Py_Initialize` to inform the interpreter about paths to +Python run-time libraries. Next initialize the Python interpreter +with :c:func:`Py_Initialize`, followed by the execution of a +hard-coded Python script that prints the date and time. Afterwards, +the :c:func:`Py_Finalize` call shuts the interpreter down, followed by +the end of the program. In a real program, you may want to get the +Python script from another source, perhaps a text-editor routine, a +file, or a database. Getting the Python code from a file can better +be done by using the :c:func:`PyRun_SimpleFile` function, which saves +you the trouble of allocating memory space and loading the file +contents. .. _lower-level-embedding: -- cgit v0.12 From ec42255039d45d9da65e52c2c21c8518334c2661 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Wed, 31 Oct 2012 16:20:54 +0200 Subject: Issue #16371: fix typo in ctypes documentation. Thanks to George Yoshida. --- Doc/library/ctypes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst index 3c602c8..83d49bd 100644 --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -1155,7 +1155,7 @@ testing. Try it out with ``import __hello__`` for example. Surprises ^^^^^^^^^ -There are some edges in :mod:`ctypes` where you may be expect something else than +There are some edges in :mod:`ctypes` where you may expect something else than what actually happens. Consider the following example:: -- cgit v0.12 From a2959cea3f3031ea002eaf58a75f657fdef65a1d Mon Sep 17 00:00:00 2001 From: R David Murray Date: Wed, 31 Oct 2012 10:50:27 -0400 Subject: #16371: fix up the English a bit more. --- Doc/library/ctypes.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst index 83d49bd..3887ee1 100644 --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -1155,8 +1155,8 @@ testing. Try it out with ``import __hello__`` for example. Surprises ^^^^^^^^^ -There are some edges in :mod:`ctypes` where you may expect something else than -what actually happens. +There are some edges in :mod:`ctypes` where you might expect something other +than what actually happens. Consider the following example:: -- cgit v0.12 From 64085e306495769161dc278c5c61490dc767e598 Mon Sep 17 00:00:00 2001 From: Jesus Cea Date: Wed, 31 Oct 2012 17:00:59 +0100 Subject: Closes #16369: Global PyTypeObjects not initialized with PyType_Ready(...). DOCUMENT IT! --- Misc/NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 434f221..be3b1e4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -58,6 +58,8 @@ Core and Builtins - Issue #15368: An issue that caused bytecode generation to be non-deterministic when using randomized hashing (-R) has been fixed. +- Issue #16369: Global PyTypeObjects not initialized with PyType_Ready(...). + - Issue #15020: The program name used to search for Python's path is now "python3" under Unix, not "python". -- cgit v0.12