[PATCH 2 of 7] base85: use PYMODULEINIT

[Jun Wu]

# HG changeset patch
# User Jun Wu <qu...@fb.com>
# Date 1494289632 25200
#      Mon May 08 17:27:12 2017 -0700
# Node ID 1d76f329321de2af7afb59dc06c61bae87078481
# Parent  a2c5e183cafca6d58a0dd986870ac620be1fb107
# Available At https://bitbucket.org/quark-zju/hg-draft
#              hg pull https://bitbucket.org/quark-zju/hg-draft -r 1d76f329321d
base85: use PYMODULEINIT

diff --git a/mercurial/base85.c b/mercurial/base85.c
--- a/mercurial/base85.c
+++ b/mercurial/base85.c
@@ -19,5 +19,5 @@ static const char b85chars[] = "01234567
 static char b85dec[256];
 
-static void b85prep(void)
+static int b85prep(void)
 {
        unsigned i;
@@ -26,4 +26,6 @@ static void b85prep(void)
        for (i = 0; i < sizeof(b85chars); i++)
                b85dec[(int)(b85chars[i])] = i + 1;
+
+       return 0;
 }
 
@@ -158,25 +160,3 @@ static PyMethodDef methods[] = {
 };
 
-#ifdef IS_PY3K
-static struct PyModuleDef base85_module = {
-       PyModuleDef_HEAD_INIT,
-       "base85",
-       base85_doc,
-       -1,
-       methods
-};
-
-PyMODINIT_FUNC PyInit_base85(void)
-{
-       b85prep();
-
-       return PyModule_Create(&base85_module);
-}
-#else
-PyMODINIT_FUNC initbase85(void)
-{
-       Py_InitModule3("base85", methods, base85_doc);
-
-       b85prep();
-}
-#endif
+PYMODULEINIT(base85, methods, base85_doc, 1, b85prep, NULL);
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel