From: Lumir Balhar <lbalhar@redhat.com>
Date: Thu, 20 Apr 2017 13:11:58 +0000 (+0200)
Subject: python: Port simple libpython module to Python 3 compatible form
X-Git-Tag: ldb-1.1.31~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba4cabb74f9abf834ee50364fba98ba8c3e9dee3;p=thirdparty%2Fsamba.git

python: Port simple libpython module to Python 3 compatible form

Signed-off-by: Lumir Balhar <lbalhar@redhat.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/python/modules.c b/python/modules.c
index 371f0d5a07a..5db3dd348e2 100644
--- a/python/modules.c
+++ b/python/modules.c
@@ -18,13 +18,14 @@
 */
 
 #include <Python.h>
+#include "py3compat.h"
 #include "includes.h"
 #include "python/modules.h"
 #include "dynconfig/dynconfig.h"
 
 static bool PySys_PathPrepend(PyObject *list, const char *path)
 {
-	PyObject *py_path = PyString_FromString(path);
+	PyObject *py_path = PyStr_FromString(path);
 	if (py_path == NULL)
 		return false;
 
diff --git a/python/wscript b/python/wscript
index 623ca44b005..211fac4de62 100644
--- a/python/wscript
+++ b/python/wscript
@@ -51,17 +51,10 @@ def build(bld):
                       pyembed=True,
                       enabled=bld.PYTHON_BUILD_IS_ENABLED())
 
-    bld.SAMBA_SUBSYSTEM('LIBPYTHON',
-                        source='modules.c',
-                        public_deps='',
-                        init_function_sentinel='{NULL,NULL}',
-                        deps='talloc',
-                        pyext=True,
-                        enabled=bld.PYTHON_BUILD_IS_ENABLED())
-
     for env in bld.gen_python_environments():
         pytalloc_util = bld.pyembed_libname('pytalloc-util')
         pyparam_util = bld.pyembed_libname('pyparam_util')
+        libpython = bld.pyembed_libname('LIBPYTHON')
 
         bld.SAMBA_PYTHON('python_glue',
                          source='pyglue.c',
@@ -73,6 +66,14 @@ def build(bld):
                               ''' % (pyparam_util, pytalloc_util),
                          realname='samba/_glue.so')
 
+        bld.SAMBA_SUBSYSTEM(libpython,
+                            source='modules.c',
+                            public_deps='',
+                            init_function_sentinel='{NULL,NULL}',
+                            deps='talloc',
+                            pyext=True,
+                            enabled=bld.PYTHON_BUILD_IS_ENABLED())
+
     if bld.PYTHON_BUILD_IS_ENABLED():
         for env in bld.gen_python_environments():
             # install out various python scripts for use by make test