Make get_string_from_python Python2 compatible

Flamefire · Flamefire · commit 3a37183d01b9 · 2020-07-21T09:33:33.000+02:00
diff --git a/src/scorepy/pythonHelpers.hpp b/src/scorepy/pythonHelpers.hpp
@@ -76,7 +76,11 @@ auto cast_to_PyFunc(TFunc* func) -> detail::ReplaceArgsToPyObject_t<TFunc>*
 inline CString get_string_from_python(PyObject& o)
 {
     Py_ssize_t len;
+#if PY_MAJOR_VERSION >= 3
     const char* s = PyUnicode_AsUTF8AndSize(&o, &len);
+#else
+    const char* s = PyString_FromStringAndSize(&o, &len);
+#endif
     return CString(s, len);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,11 @@ auto cast_to_PyFunc(TFunc* func) -> detail::ReplaceArgsToPyObject_t<TFunc>*`
`76`	`76`	`inline CString get_string_from_python(PyObject& o)`
`77`	`77`	`{`
`78`	`78`	`Py_ssize_t len;`
	`79`	`+#if PY_MAJOR_VERSION >= 3`
`79`	`80`	`const char* s = PyUnicode_AsUTF8AndSize(&o, &len);`
	`81`	`+#else`
	`82`	`+ const char* s = PyString_FromStringAndSize(&o, &len);`
	`83`	`+#endif`
`80`	`84`	`return CString(s, len);`
`81`	`85`	`}`
`82`	`86`