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

[georg.brandl]

http://hg.python.org/cpython/rev/65cdd8f90df6
changeset:   86135:65cdd8f90df6
parent:      86133:bd314db5532d
parent:      86134:8410d2441e0f
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 20:46:15 2013 +0200
summary:
  merge with 3.3

files:
  Doc/extending/extending.rst |  4 +---
  1 files changed, 1 insertions(+), 3 deletions(-)


diff --git a/Doc/extending/extending.rst b/Doc/extending/extending.rst
--- a/Doc/extending/extending.rst
+++ b/Doc/extending/extending.rst
@@ -719,9 +719,7 @@
               action, voltage);
        printf("-- Lovely plumage, the %s -- It's %s!\n", type, state);
 
-       Py_INCREF(Py_None);
-
-       return Py_None;
+       Py_RETURN_NONE;
    }
 
    static PyMethodDef keywdarg_methods[] = {

-- 
Repository URL: http://hg.python.org/cpython