Covert from python2 to python3

Change-Id: I114ac6217eb3a4431defe1337c7fac5a639d6aa2
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/packaging/nlp.spec b/packaging/nlp.spec
index c933cd5..a071622 100755 (executable)
--- a/packaging/nlp.spec
+++ b/packaging/nlp.spec
@@ -11,13 +11,14 @@ BuildRequires: pkgconfig(capi-base-common)
 BuildRequires: pkgconfig(capi-appfw-service-application)
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(bundle)
-BuildRequires: pkgconfig(python)
+BuildRequires: python3-base
+BuildRequires: pkgconfig(python3)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(rpc-port)
 BuildRequires: pkgconfig(ecore)
-Requires: python-numpy
-Requires: python-xml
-Requires: python-six
+Requires: python3-numpy
+Requires: python3-xml
+Requires: python3-six
 Requires: %{name}-data-en
 
 # runtime requires

diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
index 0aae714..8e4f0e1 100755 (executable)
--- a/service/CMakeLists.txt
+++ b/service/CMakeLists.txt
@@ -26,7 +26,7 @@ pkg_check_modules(pkgs REQUIRED
         capi-base-common
         capi-appfw-service-application
         bundle
-        python
+        python3
         glib-2.0
         rpc-port
         ecore

diff --git a/service/src/service.c b/service/src/service.c
index 3ca4e90..739390f 100755 (executable)
--- a/service/src/service.c
+++ b/service/src/service.c
@@ -614,7 +614,7 @@ char* nltk_get_string_from_element(PyObject* elm)
         return ch;
     }
     memset(ch, 0, BUF_LEN_256);
-    strncpy(ch, PyString_AsString(elm), BUF_LEN_256-1);
+    strncpy(ch, PyUnicode_AsUTF8(elm), BUF_LEN_256-1);
     return ch;
 }
 
@@ -631,7 +631,7 @@ PyObject* nltk_make_args_from_string(char* info)
     PyObject *pArgs;
     //create args tuple struct to fill the arg one by one  ,here , only create one string with 1
     pArgs = PyTuple_New(1);
-    PyTuple_SetItem(pArgs, 0, PyString_FromString(info));
+    PyTuple_SetItem(pArgs, 0, PyUnicode_FromString(info));
     return pArgs;
 }
 
@@ -652,8 +652,8 @@ PyObject* nltk_make_args_from_strings(char* info, char* tag)
     PyObject *pArgs;
     //create args tuple struct to fill the arg one by one  ,here , only create one string with 1
     pArgs = PyTuple_New(2);
-    PyTuple_SetItem(pArgs, 0, PyString_FromString(info));
-    PyTuple_SetItem(pArgs, 1, PyString_FromString(tag));
+    PyTuple_SetItem(pArgs, 0, PyUnicode_FromString(info));
+    PyTuple_SetItem(pArgs, 1, PyUnicode_FromString(tag));
     return pArgs;
 }