python: Make generated modules samba.ntstatus and samba.werror Python 3 compatible.
authorLumir Balhar <lbalhar@redhat.com>
Tue, 8 Aug 2017 09:50:30 +0000 (11:50 +0200)
committerAndreas Schneider <asn@cryptomilk.org>
Tue, 22 Aug 2017 15:38:17 +0000 (17:38 +0200)
Signed-off-by: Lumir Balhar <lbalhar@redhat.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Aug 22 17:38:17 CEST 2017 on sn-devel-144

libcli/util/wscript_build
source4/scripting/bin/gen_ntstatus.py
source4/scripting/bin/gen_werror.py

index f27014e..ce91899 100644 (file)
@@ -26,14 +26,15 @@ bld.SAMBA_GENERATOR('werror_generated',
                     rule='${PYTHON} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${TGT[0].abspath(env)} ${TGT[1].abspath(env)} ${TGT[2].abspath(env)}'
                    )
 
-bld.SAMBA_PYTHON('python_ntstatus',
-       source='py_ntstatus.c',
-       deps='samba-errors',
-       realname='samba/ntstatus.so'
-       )
+for env in bld.gen_python_environments():
+       bld.SAMBA_PYTHON('python_ntstatus',
+               source='py_ntstatus.c',
+               deps='samba-errors',
+               realname='samba/ntstatus.so'
+               )
 
-bld.SAMBA_PYTHON('python_werror',
-       source='py_werror.c',
-       deps='samba-errors',
-       realname='samba/werror.so'
-       )
+       bld.SAMBA_PYTHON('python_werror',
+               source='py_werror.c',
+               deps='samba-errors',
+               realname='samba/werror.so'
+               )
index 3267c32..9e92f49 100755 (executable)
@@ -70,6 +70,7 @@ def generatePythonFile(out_file, errors):
     out_file.write(" * [MS-ERREF] http://msdn.microsoft.com/en-us/library/cc704588.aspx\n")
     out_file.write(" */\n")
     out_file.write("#include <Python.h>\n")
+    out_file.write("#include \"python/py3compat.h\"\n")
     out_file.write("#include \"includes.h\"\n\n")
     out_file.write("static inline PyObject *ndr_PyLong_FromUnsignedLongLong(unsigned long long v)\n");
     out_file.write("{\n");
@@ -82,17 +83,24 @@ def generatePythonFile(out_file, errors):
     # This is needed to avoid a missing prototype error from the C
     # compiler. There is never a prototype for this function, it is a
     # module loaded by python with dlopen() and found with dlsym().
-    out_file.write("void initntstatus(void);\n")
-    out_file.write("void initntstatus(void)\n")
+    out_file.write("static struct PyModuleDef moduledef = {\n")
+    out_file.write("\tPyModuleDef_HEAD_INIT,\n")
+    out_file.write("\t.m_name = \"ntstatus\",\n")
+    out_file.write("\t.m_doc = \"NTSTATUS error defines\",\n")
+    out_file.write("\t.m_size = -1,\n")
+    out_file.write("};\n\n")
+    out_file.write("MODULE_INIT_FUNC(ntstatus)\n")
     out_file.write("{\n")
     out_file.write("\tPyObject *m;\n\n")
-    out_file.write("\tm = Py_InitModule3(\"ntstatus\", NULL, \"NTSTATUS error defines\");\n");
+    out_file.write("\tm = PyModule_Create(&moduledef);\n");
     out_file.write("\tif (m == NULL)\n");
-    out_file.write("\t\treturn;\n\n");
+    out_file.write("\t\treturn NULL;\n\n");
     for err in errors:
         line = """\tPyModule_AddObject(m, \"%s\", 
                   \t\tndr_PyLong_FromUnsignedLongLong(NT_STATUS_V(%s)));\n""" % (err.err_define, err.err_define)
         out_file.write(line)
+    out_file.write("\n");
+    out_file.write("\treturn m;\n");
     out_file.write("}\n");
 
 def transformErrorName( error_name ):
index 9a54572..96611ae 100755 (executable)
@@ -72,6 +72,7 @@ def generatePythonFile(out_file, errors):
     out_file.write(" * [MS-ERREF] https://msdn.microsoft.com/en-us/library/cc231199.aspx\n")
     out_file.write(" */\n")
     out_file.write("#include <Python.h>\n")
+    out_file.write("#include \"python/py3compat.h\"\n")
     out_file.write("#include \"includes.h\"\n\n")
     out_file.write("static inline PyObject *ndr_PyLong_FromUnsignedLongLong(unsigned long long v)\n");
     out_file.write("{\n");
@@ -84,17 +85,24 @@ def generatePythonFile(out_file, errors):
     # This is needed to avoid a missing prototype error from the C
     # compiler. There is never a prototype for this function, it is a
     # module loaded by python with dlopen() and found with dlsym().
-    out_file.write("void initwerror(void);\n")
-    out_file.write("void initwerror(void)\n")
+    out_file.write("static struct PyModuleDef moduledef = {\n")
+    out_file.write("\tPyModuleDef_HEAD_INIT,\n")
+    out_file.write("\t.m_name = \"werror\",\n")
+    out_file.write("\t.m_doc = \"WERROR defines\",\n")
+    out_file.write("\t.m_size = -1,\n")
+    out_file.write("};\n\n")
+    out_file.write("MODULE_INIT_FUNC(werror)\n")
     out_file.write("{\n")
     out_file.write("\tPyObject *m;\n\n")
-    out_file.write("\tm = Py_InitModule3(\"werror\", NULL, \"WERROR defines\");\n");
+    out_file.write("\tm = PyModule_Create(&moduledef);\n");
     out_file.write("\tif (m == NULL)\n");
-    out_file.write("\t\treturn;\n\n");
+    out_file.write("\t\treturn NULL;\n\n");
     for err in errors:
         line = """\tPyModule_AddObject(m, \"%s\",
                   \t\tndr_PyLong_FromUnsignedLongLong(W_ERROR_V(%s)));\n""" % (err.err_define, err.err_define)
         out_file.write(line)
+    out_file.write("\n");
+    out_file.write("\treturn m;\n");
     out_file.write("}\n");
 
 def transformErrorName( error_name ):