replace PyString_FromString usages with PyUnicode_FromString

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

Author: hoefling

src/constants.c

@@ -27,7 +27,7 @@ static PyObject* PyXmlSec_Transform__str__(PyObject* self) {
     else
         snprintf(buf, sizeof(buf), "%s, None", transform->id->name);
 
-    return PyString_FromString(buf);
+    return PyUnicode_FromString(buf);
 }
 
 // __repr__ method
@@ -38,18 +38,18 @@ static PyObject* PyXmlSec_Transform__repr__(PyObject* self) {
         snprintf(buf, sizeof(buf), "__Transform('%s', '%s', %d)", transform->id->name, transform->id->href, transform->id->usage);
     else
         snprintf(buf, sizeof(buf), "__Transform('%s', None, %d)", transform->id->name, transform->id->usage);
-    return PyString_FromString(buf);
+    return PyUnicode_FromString(buf);
 }
 
 static const char PyXmlSec_TransformNameGet__doc__[] = "The transform's name.";
 static PyObject* PyXmlSec_TransformNameGet(PyXmlSec_Transform* self, void* closure) {
-    return PyString_FromString((const char*)self->id->name);
+    return PyUnicode_FromString((const char*)self->id->name);
 }
 
 static const char PyXmlSec_TransformHrefGet__doc__[] = "The transform's identification string (href).";
 static PyObject* PyXmlSec_TransformHrefGet(PyXmlSec_Transform* self, void* closure) {
     if (self->id->href != NULL)
-        return PyString_FromString((const char*)self->id->href);
+        return PyUnicode_FromString((const char*)self->id->href);
     Py_RETURN_NONE;
 }
 
@@ -149,7 +149,7 @@ static PyObject* PyXmlSec_KeyData__str__(PyObject* self) {
         snprintf(buf, sizeof(buf), "%s, %s", keydata->id->name, keydata->id->href);
     else
         snprintf(buf, sizeof(buf), "%s, None", keydata->id->name);
-    return PyString_FromString(buf);
+    return PyUnicode_FromString(buf);
 }
 
 // __repr__ method
@@ -160,18 +160,18 @@ static PyObject* PyXmlSec_KeyData__repr__(PyObject* self) {
         snprintf(buf, sizeof(buf), "__KeyData('%s', '%s')", keydata->id->name, keydata->id->href);
     else
         snprintf(buf, sizeof(buf), "__KeyData('%s', None)", keydata->id->name);
-    return PyString_FromString(buf);
+    return PyUnicode_FromString(buf);
 }
 
 static const char PyXmlSec_KeyDataNameGet__doc__[] = "The key data's name.";
 static PyObject* PyXmlSec_KeyDataNameGet(PyXmlSec_KeyData* self, void* closure) {
-    return PyString_FromString((const char*)self->id->name);
+    return PyUnicode_FromString((const char*)self->id->name);
 }
 
 static const char PyXmlSec_KeyDataHrefGet__doc__[] = "The key data's identification string (href).";
 static PyObject* PyXmlSec_KeyDataHrefGet(PyXmlSec_KeyData* self, void* closure) {
     if (self->id->href != NULL)
-        return PyString_FromString((const char*)self->id->href);
+        return PyUnicode_FromString((const char*)self->id->href);
     Py_RETURN_NONE;
 }
 
@@ -308,7 +308,7 @@ int PyXmlSec_ConstantsModule_Init(PyObject* package) {
 
 
 #define PYXMLSEC_ADD_NS_CONSTANT(name, lname) \
-    tmp = PyString_FromString((const char*)(JOIN(xmlSec, name))); \
+    tmp = PyUnicode_FromString((const char*)(JOIN(xmlSec, name))); \
     PYXMLSEC_ADD_CONSTANT(nsCls, name, lname);
 
     // namespaces
@@ -334,7 +334,7 @@ int PyXmlSec_ConstantsModule_Init(PyObject* package) {
 
 
 #define PYXMLSEC_ADD_ENC_CONSTANT(name, lname) \
-    tmp = PyString_FromString((const char*)(JOIN(xmlSec, name))); \
+    tmp = PyUnicode_FromString((const char*)(JOIN(xmlSec, name))); \
     PYXMLSEC_ADD_CONSTANT(encryptionTypeCls, name, lname);
 
     // encryption type
@@ -349,7 +349,7 @@ int PyXmlSec_ConstantsModule_Init(PyObject* package) {
 
 
 #define PYXMLSEC_ADD_NODE_CONSTANT(name, lname) \
-    tmp = PyString_FromString((const char*)(JOIN(xmlSec, name))); \
+    tmp = PyUnicode_FromString((const char*)(JOIN(xmlSec, name))); \
     PYXMLSEC_ADD_CONSTANT(nodeCls, name, lname);
 
     // node

src/keys.c

@@ -436,7 +436,7 @@ static PyObject* PyXmlSec_KeyNameGet(PyObject* self, void* closure) {
     }
     cname = (const char*)xmlSecKeyGetName(key->handle);
     if (cname != NULL) {
-        return PyString_FromString(cname);
+        return PyUnicode_FromString(cname);
     }
     Py_RETURN_NONE;
 }

src/platform.h

@@ -40,8 +40,6 @@ typedef int Py_ssize_t;
 #define PyString_Check PyUnicode_Check
 #define PyString_FromStringAndSize PyUnicode_FromStringAndSize
 
-#define PyString_FromString PyUnicode_FromString
-
 #define PyString_AsString PyUnicode_AsUTF8
 #define PyString_AsUtf8AndSize PyUnicode_AsUTF8AndSize
 

src/template.c

@@ -766,7 +766,7 @@ static PyObject* PyXmlSec_TemplateTransformAddC14NInclNamespaces(PyObject* self,
         goto ON_FAIL;
     }
     if (PyList_Check(prefixes) || PyTuple_Check(prefixes)) {
-        sep = PyString_FromString(" ");
+        sep = PyUnicode_FromString(" ");
         prefixes = PyObject_CallMethod(sep, "join", "O", prefixes);
         Py_DECREF(sep);
     } else if (PyString_Check(prefixes)) {

src/utils.c

@@ -32,7 +32,7 @@ PyObject* PyXmlSec_GetFilePathOrContent(PyObject* file, int* is_content) {
 }
 
 int PyXmlSec_SetStringAttr(PyObject* obj, const char* name, const char* value) {
-    PyObject* tmp = PyString_FromString(value);
+    PyObject* tmp = PyUnicode_FromString(value);
     int r;
 
     if (tmp == NULL) {