replace PyString_AsString usages with PyUnicode_AsUTF8

Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com>

Author: hoefling

src/keys.c

@@ -460,7 +460,7 @@ static int PyXmlSec_KeyNameSet(PyObject* self, PyObject* value, void* closure) {
         return 0;
     }
 
-    name = PyString_AsString(value);
+    name = PyUnicode_AsUTF8(value);
     if (name == NULL) return -1;
 
     if (xmlSecKeySetName(key->handle, XSTR(name)) < 0) {

src/platform.h

@@ -38,14 +38,11 @@ typedef int Py_ssize_t;
 #if PY_MAJOR_VERSION >= 3
 #define PY3K 1
 
-#define PyString_AsString PyUnicode_AsUTF8
-
 #define PyCreateDummyObject PyModule_New
 
 #define PyString_FSConverter PyUnicode_FSConverter
 #else // PY3K
 
-#define PyBytes_AsString PyString_AsString
 #define PyBytes_AsStringAndSize PyString_AsStringAndSize
 
 static inline PyObject* PyCreateDummyObject(const char* name) {

src/template.c

@@ -781,7 +781,7 @@ static PyObject* PyXmlSec_TemplateTransformAddC14NInclNamespaces(PyObject* self,
     }
 
 
-    c_prefixes = PyString_AsString(prefixes);
+    c_prefixes = PyUnicode_AsUTF8(prefixes);
     Py_BEGIN_ALLOW_THREADS;
     res = xmlSecTmplTransformAddC14NInclNamespaces(node->_c_node, XSTR(c_prefixes));
     Py_END_ALLOW_THREADS;

src/tree.c

@@ -182,7 +182,7 @@ static PyObject* PyXmlSec_TreeAddIds(PyObject* self, PyObject *args, PyObject *k
         tmp = PyObject_GetItem(ids, key);
         Py_DECREF(key);
         if (tmp == NULL) goto ON_FAIL;
-        list[i] = XSTR(PyString_AsString(tmp));
+        list[i] = XSTR(PyUnicode_AsUTF8(tmp));
         Py_DECREF(tmp);
         if (list[i] == NULL) goto ON_FAIL;
     }