diff options
| author | Stefan Krah <skrah@bytereef.org> | 2014-06-29 22:16:09 (GMT) |
|---|---|---|
| committer | Stefan Krah <skrah@bytereef.org> | 2014-06-29 22:16:09 (GMT) |
| commit | d95224ceaf61b6c4cbc7fd8e851a1268f6eee914 (patch) | |
| tree | b3e55e947e957e6b579d1cdd722fd29f31f471de /Doc/c-api | |
| parent | f026dae130bf6f9015c4b212f16852ba4a3f3dec (diff) | |
| parent | bb458dbe597c64b5694d30f18b3f89bbdc2b3ab4 (diff) | |
| download | cpython-d95224ceaf61b6c4cbc7fd8e851a1268f6eee914.zip cpython-d95224ceaf61b6c4cbc7fd8e851a1268f6eee914.tar.gz cpython-d95224ceaf61b6c4cbc7fd8e851a1268f6eee914.tar.bz2 | |
Merge 3.4.
Diffstat (limited to 'Doc/c-api')
| -rw-r--r-- | 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 index a7de37e..230c6a9 100644 --- a/Doc/c-api/buffer.rst +++ b/Doc/c-api/buffer.rst @@ -489,8 +489,8 @@ Buffer-related functions :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. |