[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

Thu Jun 2 14:36:51 EDT 2016

https://hg.python.org/cpython/rev/00c95b0e82e4
changeset: 101604:00c95b0e82e4
parent: 101601:4a9159ea2536
parent: 101602:7c67cb3b54b4
user: Benjamin Peterson <benjamin at python.org>
date: Thu Jun 02 11:36:16 2016 -0700
summary:
 merge 3.5
files:
 Doc/c-api/gcsupport.rst | 7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Doc/c-api/gcsupport.rst b/Doc/c-api/gcsupport.rst
--- a/Doc/c-api/gcsupport.rst
+++ b/Doc/c-api/gcsupport.rst
@@ -126,9 +126,10 @@
 
 .. c:function:: void Py_VISIT(PyObject *o)
 
- Call the *visit* callback, with arguments *o* and *arg*. If *visit* returns
- a non-zero value, then return it. Using this macro, :c:member:`~PyTypeObject.tp_traverse`
- handlers look like::
+ If *o* is not *NULL*, call the *visit* callback, with arguments *o*
+ and *arg*. If *visit* returns a non-zero value, then return it.
+ Using this macro, :c:member:`~PyTypeObject.tp_traverse` handlers
+ look like::
 
 static int
 my_traverse(Noddy *self, visitproc visit, void *arg)
-- 
Repository URL: https://hg.python.org/cpython
