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

[eli.bendersky]

http://hg.python.org/cpython/rev/f46b4b7b817c
changeset:   78589:f46b4b7b817c
parent:      78586:7c8c6b905a18
parent:      78588:a4ad88218dca
user:        Eli Bendersky <eliben at gmail.com>
date:        Wed Aug 15 14:51:08 2012 +0300
summary:
  merge 3.2

files:
  Doc/extending/extending.rst |  15 ++++++++++-----
  1 files changed, 10 insertions(+), 5 deletions(-)


diff --git a/Doc/extending/extending.rst b/Doc/extending/extending.rst
--- a/Doc/extending/extending.rst
+++ b/Doc/extending/extending.rst
@@ -732,13 +732,18 @@
        {NULL, NULL, 0, NULL}   /* sentinel */
    };
 
-::
+   static struct PyModuleDef keywdargmodule = {
+       PyModuleDef_HEAD_INIT,
+       "keywdarg",
+       NULL,
+       -1,
+       keywdarg_methods
+   };
 
-   void
-   initkeywdarg(void)
+   PyMODINIT_FUNC
+   PyInit_keywdarg(void)
    {
-     /* Create the module and add the functions */
-     Py_InitModule("keywdarg", keywdarg_methods);
+       return PyModule_Create(&keywdargmodule);
    }
 
 

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