[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4.
stefan.krah
python-checkins at python.org
Mon Jun 30 00:17:01 CEST 2014
http://hg.python.org/cpython/rev/04562803d346
changeset: 91469:04562803d346
parent: 91467:10cf594ace4b
parent: 91468:49cdb04bfcc6
user: Stefan Krah <skrah at bytereef.org>
date: Mon Jun 30 00:16:09 2014 +0200
summary:
Merge 3.4.
files:
Doc/c-api/buffer.rst | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -489,8 +489,8 @@
:c:member:`view->obj` to *NULL* and return -1;
If this function is used as part of a :ref:`getbufferproc <buffer-structs>`,
- *exporter* MUST be set to the exporting object. Otherwise, *exporter* MUST
- be NULL.
+ *exporter* MUST be set to the exporting object and *flags* must be passed
+ unmodified. Otherwise, *exporter* MUST be NULL.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list