From 36230c0b5d872388449b20d46d39a9e66a017714 Mon Sep 17 00:00:00 2001
From: "David C. Rankin" <trin@3111skyline.com>
Date: Sat, 27 Sep 2014 11:36:51 -0500
Subject: Add Python >= v3 support to SuperKaramba

---
 superkaramba/src/svcgrp_python.cpp | 68 +++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

(limited to 'superkaramba/src/svcgrp_python.cpp')

diff --git a/superkaramba/src/svcgrp_python.cpp b/superkaramba/src/svcgrp_python.cpp
index 8b827ec..236d920 100644
--- a/superkaramba/src/svcgrp_python.cpp
+++ b/superkaramba/src/svcgrp_python.cpp
@@ -37,16 +37,16 @@ static PyObject *get_svc_grp(KServiceGroup::Ptr const& g)
 	PyObject *tuple = PyTuple_New(2);
 	PyObject *dict = PyDict_New();
 
-	PyDict_SetItem(dict, PyString_FromString("caption"),
-			             PyString_FromString(g->caption().ascii()));
+	PyDict_SetItem(dict, PyBytes_FromString("caption"),
+			             PyBytes_FromString(g->caption().ascii()));
 	if (g->comment() != NULL)
-		PyDict_SetItem(dict, PyString_FromString("comment"),
-	                     PyString_FromString(g->comment().ascii()));
+		PyDict_SetItem(dict, PyBytes_FromString("comment"),
+	                     PyBytes_FromString(g->comment().ascii()));
 	if (g->icon() != NULL)
-		PyDict_SetItem(dict, PyString_FromString("icon"),
-	                     PyString_FromString(g->icon().ascii()));
-	PyDict_SetItem(dict, PyString_FromString("relpath"),
-	                     PyString_FromString(g->relPath().ascii()));
+		PyDict_SetItem(dict, PyBytes_FromString("icon"),
+	                     PyBytes_FromString(g->icon().ascii()));
+	PyDict_SetItem(dict, PyBytes_FromString("relpath"),
+	                     PyBytes_FromString(g->relPath().ascii()));
 
 	PyTuple_SET_ITEM(tuple, 0, Py_BuildValue((char*)"l", 0));
 	PyTuple_SET_ITEM(tuple, 1, dict);
@@ -61,43 +61,43 @@ static PyObject *get_svc(KService::Ptr const& g)
 	PyObject *dict = PyDict_New();
 
 	if (g->exec() != NULL)
-		PyDict_SetItem(dict, PyString_FromString("exec"),
-			             PyString_FromString(g->exec().ascii()));
+		PyDict_SetItem(dict, PyBytes_FromString("exec"),
+			             PyBytes_FromString(g->exec().ascii()));
 	if (g->menuId() != NULL)
-		PyDict_SetItem(dict, PyString_FromString("menuid"),
-			             PyString_FromString(g->menuId().ascii()));
+		PyDict_SetItem(dict, PyBytes_FromString("menuid"),
+			             PyBytes_FromString(g->menuId().ascii()));
 	if (g->name() != NULL)
-		PyDict_SetItem(dict, PyString_FromString("name"),
-			             PyString_FromString(g->name().ascii()));
+		PyDict_SetItem(dict, PyBytes_FromString("name"),
+			             PyBytes_FromString(g->name().ascii()));
 	if (g->path() != NULL)
-		PyDict_SetItem(dict, PyString_FromString("path"),
-			             PyString_FromString(g->path().ascii()));
+		PyDict_SetItem(dict, PyBytes_FromString("path"),
+			             PyBytes_FromString(g->path().ascii()));
 	if (g->icon() != NULL)
-		PyDict_SetItem(dict, PyString_FromString("icon"),
-			             PyString_FromString(g->icon().ascii()));
+		PyDict_SetItem(dict, PyBytes_FromString("icon"),
+			             PyBytes_FromString(g->icon().ascii()));
 	if (g->library() != NULL)
-		PyDict_SetItem(dict, PyString_FromString("library"),
-			             PyString_FromString(g->library().ascii()));
+		PyDict_SetItem(dict, PyBytes_FromString("library"),
+			             PyBytes_FromString(g->library().ascii()));
 	if (g->comment() != NULL)
-		PyDict_SetItem(dict, PyString_FromString("comment"),
-			             PyString_FromString(g->comment().ascii()));
+		PyDict_SetItem(dict, PyBytes_FromString("comment"),
+			             PyBytes_FromString(g->comment().ascii()));
 	if (g->type() != NULL)
-		PyDict_SetItem(dict, PyString_FromString("type"),
-			             PyString_FromString(g->type().ascii()));
+		PyDict_SetItem(dict, PyBytes_FromString("type"),
+			             PyBytes_FromString(g->type().ascii()));
 	if (g->genericName() != NULL)
-		PyDict_SetItem(dict, PyString_FromString("genericname"),
-			             PyString_FromString(g->genericName().ascii()));
+		PyDict_SetItem(dict, PyBytes_FromString("genericname"),
+			             PyBytes_FromString(g->genericName().ascii()));
 	/*
-	PyDict_SetItem(dict, PyString_FromString("terminal"),
+	PyDict_SetItem(dict, PyBytes_FromString("terminal"),
 						 Py_BuildValue("l", g->terminal()));
-	PyDict_SetItem(dict, PyString_FromString("type"),
-			             PyString_FromString(g->type().ascii()));
-	PyDict_SetItem(dict, PyString_FromString("username"),
-			             PyString_FromString(g->username().ascii()));
-	PyDict_SetItem(dict, PyString_FromString("substuid"),
+	PyDict_SetItem(dict, PyBytes_FromString("type"),
+			             PyBytes_FromString(g->type().ascii()));
+	PyDict_SetItem(dict, PyBytes_FromString("username"),
+			             PyBytes_FromString(g->username().ascii()));
+	PyDict_SetItem(dict, PyBytes_FromString("substuid"),
 						 Py_BuildValue("l", g->substituteUid()));
-	PyDict_SetItem(dict, PyString_FromString("path"),
-			             PyString_FromString(g->path().ascii()));
+	PyDict_SetItem(dict, PyBytes_FromString("path"),
+			             PyBytes_FromString(g->path().ascii()));
 						 */
 
 	PyTuple_SET_ITEM(tuple, 0, Py_BuildValue((char*)"l", 1));
-- 
cgit v1.2.1