[Python-checkins] cpython (merge default -> default): merge heads
benjamin.peterson
python-checkins at python.org
Wed Oct 31 18:36:30 CET 2012
http://hg.python.org/cpython/rev/f2e4b9870cfb
changeset: 80107:f2e4b9870cfb
parent: 80106:e87d617cef23
parent: 80105:f1310219c702
user: Benjamin Peterson <benjamin at python.org>
date: Wed Oct 31 13:36:21 2012 -0400
summary:
merge heads
files:
Doc/c-api/sys.rst | 6 --
Doc/data/refcounts.dat | 4 -
Doc/extending/embedding.rst | 21 ++++++---
Doc/library/ctypes.rst | 4 +-
Doc/library/unittest.mock.rst | 3 +-
Doc/library/winreg.rst | 49 ++++++++++++----------
Misc/NEWS | 2 +
Modules/_collectionsmodule.c | 2 +-
PC/winreg.c | 16 +++---
9 files changed, 54 insertions(+), 53 deletions(-)
diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst
--- a/Doc/c-api/sys.rst
+++ b/Doc/c-api/sys.rst
@@ -61,12 +61,6 @@
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
--- a/Doc/data/refcounts.dat
+++ b/Doc/data/refcounts.dat
@@ -1315,10 +1315,6 @@
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::
diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst
--- a/Doc/extending/embedding.rst
+++ b/Doc/extending/embedding.rst
@@ -58,6 +58,7 @@
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 @@
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:
diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
--- a/Doc/library/ctypes.rst
+++ b/Doc/library/ctypes.rst
@@ -1094,8 +1094,8 @@
Surprises
^^^^^^^^^
-There are some edges in :mod:`ctypes` where you may be 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::
diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -1,3 +1,4 @@
+
:mod:`unittest.mock` --- mock object library
============================================
@@ -646,7 +647,7 @@
which have no meaning on a non-callable mock.
Mock objects that use a class or an instance as a `spec` or `spec_set` are able
-to pass `isintance` tests:
+to pass `isinstance` tests:
>>> mock = Mock(spec=SomeClass)
>>> isinstance(mock, SomeClass)
diff --git a/Doc/library/winreg.rst b/Doc/library/winreg.rst
--- a/Doc/library/winreg.rst
+++ b/Doc/library/winreg.rst
@@ -12,6 +12,17 @@
to ensure that the handles are closed correctly, even if the programmer neglects
to explicitly close them.
+.. _exception-changed:
+
+.. versionchanged:: 3.3
+ Several functions in this module used to raise a
+ :exc:`WindowsError`, which is now an alias of :exc:`OSError`.
+
+.. _functions:
+
+Functions
+------------------
+
This module offers the following functions:
@@ -37,12 +48,11 @@
*key* is the predefined handle to connect to.
- The return value is the handle of the opened key. If the function fails, a
+ The return value is the handle of the opened key. If the function fails, an
:exc:`OSError` exception is raised.
.. versionchanged:: 3.3
- This function used to raise a :exc:`WindowsError`, which is now an
- alias of :exc:`OSError`.
+ See :ref:`above <exception-changed>`.
.. function:: CreateKey(key, sub_key)
@@ -60,12 +70,11 @@
If the key already exists, this function opens the existing key.
- The return value is the handle of the opened key. If the function fails, a
+ The return value is the handle of the opened key. If the function fails, an
:exc:`OSError` exception is raised.
.. versionchanged:: 3.3
- This function used to raise a :exc:`WindowsError`, which is now an
- alias of :exc:`OSError`.
+ See :ref:`above <exception-changed>`.
.. function:: CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE)
@@ -89,14 +98,13 @@
If the key already exists, this function opens the existing key.
- The return value is the handle of the opened key. If the function fails, a
+ The return value is the handle of the opened key. If the function fails, an
:exc:`OSError` exception is raised.
.. versionadded:: 3.2
.. versionchanged:: 3.3
- This function used to raise a :exc:`WindowsError`, which is now an
- alias of :exc:`OSError`.
+ See :ref:`above <exception-changed>`.
.. function:: DeleteKey(key, sub_key)
@@ -112,11 +120,10 @@
*This method can not delete keys with subkeys.*
If the method succeeds, the entire key, including all of its values, is removed.
- If the method fails, a :exc:`OSError` exception is raised.
+ If the method fails, an :exc:`OSError` exception is raised.
.. versionchanged:: 3.3
- This function used to raise a :exc:`WindowsError`, which is now an
- alias of :exc:`OSError`.
+ See :ref:`above <exception-changed>`.
.. function:: DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0)
@@ -145,15 +152,14 @@
*This method can not delete keys with subkeys.*
If the method succeeds, the entire key, including all of its values, is
- removed. If the method fails, a :exc:`OSError` exception is raised.
+ removed. If the method fails, an :exc:`OSError` exception is raised.
On unsupported Windows versions, :exc:`NotImplementedError` is raised.
.. versionadded:: 3.2
.. versionchanged:: 3.3
- This function used to raise a :exc:`WindowsError`, which is now an
- alias of :exc:`OSError`.
+ See :ref:`above <exception-changed>`.
.. function:: DeleteValue(key, value)
@@ -176,12 +182,11 @@
*index* is an integer that identifies the index of the key to retrieve.
The function retrieves the name of one subkey each time it is called. It is
- typically called repeatedly until a :exc:`OSError` exception is
+ typically called repeatedly until an :exc:`OSError` exception is
raised, indicating, no more values are available.
.. versionchanged:: 3.3
- This function used to raise a :exc:`WindowsError`, which is now an
- alias of :exc:`OSError`.
+ See :ref:`above <exception-changed>`.
.. function:: EnumValue(key, index)
@@ -194,7 +199,7 @@
*index* is an integer that identifies the index of the value to retrieve.
The function retrieves the name of one subkey each time it is called. It is
- typically called repeatedly, until a :exc:`OSError` exception is
+ typically called repeatedly, until an :exc:`OSError` exception is
raised, indicating no more values.
The result is a tuple of 3 items:
@@ -214,8 +219,7 @@
+-------+--------------------------------------------+
.. versionchanged:: 3.3
- This function used to raise a :exc:`WindowsError`, which is now an
- alias of :exc:`OSError`.
+ See :ref:`above <exception-changed>`.
.. function:: ExpandEnvironmentStrings(str)
@@ -295,8 +299,7 @@
Allow the use of named arguments.
.. versionchanged:: 3.3
- This function used to raise a :exc:`WindowsError`, which is now an
- alias of :exc:`OSError`.
+ See :ref:`above <exception-changed>`.
.. function:: QueryInfoKey(key)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -632,6 +632,8 @@
- Issue #15110: Fix the tracebacks generated by "import xxx" to not show the
importlib stack frames.
+- 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".
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -1019,7 +1019,7 @@
};
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.");
diff --git a/PC/winreg.c b/PC/winreg.c
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -89,7 +89,7 @@
"key is the predefined handle to connect to.\n"
"\n"
"The return value is the handle of the opened key.\n"
-"If the function fails, a WindowsError exception is raised.");
+"If the function fails, an OSError exception is raised.");
PyDoc_STRVAR(CreateKey_doc,
"CreateKey(key, sub_key) -> key\n"
@@ -104,7 +104,7 @@
"If the key already exists, this function opens the existing key.\n"
"\n"
"The return value is the handle of the opened key.\n"
-"If the function fails, a WindowsError exception is raised.");
+"If the function fails, an OSError exception is raised.");
PyDoc_STRVAR(CreateKeyEx_doc,
"CreateKeyEx(key, sub_key, reserved=0, access=KEY_WRITE) -> key\n"
@@ -122,7 +122,7 @@
"If the key already exists, this function opens the existing key\n"
"\n"
"The return value is the handle of the opened key.\n"
-"If the function fails, a WindowsError exception is raised.");
+"If the function fails, an OSError exception is raised.");
PyDoc_STRVAR(DeleteKey_doc,
"DeleteKey(key, sub_key)\n"
@@ -136,7 +136,7 @@
"This method can not delete keys with subkeys.\n"
"\n"
"If the function succeeds, the entire key, including all of its values,\n"
-"is removed. If the function fails, a WindowsError exception is raised.");
+"is removed. If the function fails, an OSError exception is raised.");
PyDoc_STRVAR(DeleteKeyEx_doc,
"DeleteKeyEx(key, sub_key, access=KEY_WOW64_64KEY, reserved=0)\n"
@@ -153,7 +153,7 @@
"This method can not delete keys with subkeys.\n"
"\n"
"If the function succeeds, the entire key, including all of its values,\n"
-"is removed. If the function fails, a WindowsError exception is raised.\n"
+"is removed. If the function fails, an OSError exception is raised.\n"
"On unsupported Windows versions, NotImplementedError is raised.");
PyDoc_STRVAR(DeleteValue_doc,
@@ -171,7 +171,7 @@
"index is an integer that identifies the index of the key to retrieve.\n"
"\n"
"The function retrieves the name of one subkey each time it is called.\n"
-"It is typically called repeatedly until a WindowsError exception is\n"
+"It is typically called repeatedly until an OSError exception is\n"
"raised, indicating no more values are available.");
PyDoc_STRVAR(EnumValue_doc,
@@ -181,7 +181,7 @@
"index is an integer that identifies the index of the value to retrieve.\n"
"\n"
"The function retrieves the name of one subkey each time it is called.\n"
-"It is typically called repeatedly, until a WindowsError exception\n"
+"It is typically called repeatedly, until an OSError exception\n"
"is raised, indicating no more values.\n"
"\n"
"The result is a tuple of 3 items:\n"
@@ -240,7 +240,7 @@
" security access for the key. Default is KEY_READ\n"
"\n"
"The result is a new handle to the specified key\n"
-"If the function fails, a WindowsError exception is raised.");
+"If the function fails, an OSError exception is raised.");
PyDoc_STRVAR(OpenKeyEx_doc, "See OpenKey()");
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list