mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
b9c4d4e205
Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
Update python plugin for python3
|
|
|
|
Since the python plugin compiles against python2,
|
|
it must be updated, in order to use with python3.
|
|
|
|
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
|
|
---
|
|
plugin_python.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/plugin_python.c b/plugin_python.c
|
|
index fcd3419..4468a46 100644
|
|
--- a/plugin_python.c
|
|
+++ b/plugin_python.c
|
|
@@ -55,7 +55,7 @@ static void pyt_exec_str(RESULT * result, const char *module, const char *functi
|
|
const char *rv = NULL;
|
|
int i;
|
|
|
|
- pName = PyString_FromString(module);
|
|
+ pName = PyUnicode_FromString(module);
|
|
/* Error checking of pName left out */
|
|
|
|
pModule = PyImport_Import(pName);
|
|
@@ -71,7 +71,7 @@ static void pyt_exec_str(RESULT * result, const char *module, const char *functi
|
|
if (pFunc && PyCallable_Check(pFunc)) {
|
|
pArgs = PyTuple_New(argc);
|
|
for (i = 0; i < argc; ++i) {
|
|
- pValue = PyString_FromString(argv[i]);
|
|
+ pValue = PyUnicode_FromString(argv[i]);
|
|
if (!pValue) {
|
|
Py_DECREF(pArgs);
|
|
Py_DECREF(pModule);
|
|
@@ -85,7 +85,7 @@ static void pyt_exec_str(RESULT * result, const char *module, const char *functi
|
|
pValue = PyObject_CallObject(pFunc, pArgs);
|
|
Py_DECREF(pArgs);
|
|
if (pValue != NULL) {
|
|
- rv = PyString_AsString(pValue);
|
|
+ rv = PyUnicode_AsUTF8(pValue);
|
|
SetResult(&result, R_STRING, rv);
|
|
Py_DECREF(pValue);
|
|
/* rv is now a 'dangling reference' */
|