replace PyString_FSConverter usages with PyUnicode_FSConverter

Signed-off-by: oleg.hoefling <[email protected]>

Author: hoefling

src/keys.c

@@ -249,7 +249,7 @@ static PyObject* PyXmlSec_KeyFromBinaryFile(PyObject* self, PyObject* args, PyOb
 
     PYXMLSEC_DEBUG("load symmetric key - start");
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!O&:from_binary_file", kwlist,
-        PyXmlSec_KeyDataType, &keydata,  PyString_FSConverter, &filepath))
+        PyXmlSec_KeyDataType, &keydata, PyUnicode_FSConverter, &filepath))
     {
         goto ON_FAIL;
     }
@@ -698,7 +698,7 @@ static PyObject* PyXmlSec_KeysManagerLoadCert(PyObject* self, PyObject* args, Py
 
     PYXMLSEC_DEBUGF("%p: load cert - start", self);
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&II:load_cert", kwlist,
-        PyString_FSConverter, &filepath, &format, &type)) {
+        PyUnicode_FSConverter, &filepath, &format, &type)) {
         goto ON_FAIL;
     }
 

src/platform.h

@@ -37,22 +37,10 @@ typedef int Py_ssize_t;
 
 #if PY_MAJOR_VERSION >= 3
 #define PY3K 1
-
-#define PyString_FSConverter PyUnicode_FSConverter
 #else // PY3K
 
 #define PyBytes_AsStringAndSize PyString_AsStringAndSize
 
-static inline int PyString_FSConverter(PyObject* o, PyObject** p) {
-    if (o == NULL) {
-        return 0;
-    }
-
-    Py_INCREF(o);
-    *p = o;
-    return 1;
-}
-
 #endif // PYTHON3
 
 static inline char* PyBytes_AsStringAndSize2(PyObject *obj, Py_ssize_t* length) {

src/utils.c

@@ -25,7 +25,7 @@ PyObject* PyXmlSec_GetFilePathOrContent(PyObject* file, int* is_content) {
         return data;
     }
     *is_content = 0;
-    if (!PyString_FSConverter(file, &tmp)) {
+    if (!PyUnicode_FSConverter(file, &tmp)) {
         return NULL;
     }
     return tmp;