Make get_string_from_python Python2 compatible

Flamefire · Flamefire · commit 8556089fa090 · 2021-04-21T11:08:37.000+02:00
diff --git a/src/scorepy/pythonHelpers.hpp b/src/scorepy/pythonHelpers.hpp
@@ -75,9 +75,14 @@ auto cast_to_PyFunc(TFunc* func) -> detail::ReplaceArgsToPyObject_t<TFunc>*
 
 inline CString get_string_from_python(PyObject& o)
 {
+#if PY_MAJOR_VERSION >= 3
     Py_ssize_t len;
     const char* s = PyUnicode_AsUTF8AndSize(&o, &len);
     return CString(s, len);
+#else
+    const char* s = PyString_AsString(&o);
+    return CString(s);
+#endif
 }
 
 /// Pair of a C-String and it's length useful for PyArg_ParseTuple with 's#'

Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,14 @@ auto cast_to_PyFunc(TFunc* func) -> detail::ReplaceArgsToPyObject_t<TFunc>*`
`75`	`75`
`76`	`76`	`inline CString get_string_from_python(PyObject& o)`
`77`	`77`	`{`
	`78`	`+#if PY_MAJOR_VERSION >= 3`
`78`	`79`	`Py_ssize_t len;`
`79`	`80`	`const char* s = PyUnicode_AsUTF8AndSize(&o, &len);`
`80`	`81`	`return CString(s, len);`
	`82`	`+#else`
	`83`	`+ const char* s = PyString_AsString(&o);`
	`84`	`+ return CString(s);`
	`85`	`+#endif`
`81`	`86`	`}`
`82`	`87`
`83`	`88`	`/// Pair of a C-String and it's length useful for PyArg_ParseTuple with 's#'`