kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: remove Py2 code

Browse Source
This commit is contained in:
luz paz
2021-04-23 12:48:46 -04:00
committed by wwmayer
parent 31b0f25b6d
commit 142c2c2c4d
16 changed files with 0 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Base/Tools.cpp
View File

@@ -153,11 +153,7 @@ std::string Base::Tools::escapedUnicodeFromUtf8(const char *s)
PyObject* escaped = PyUnicode_AsUnicodeEscapeString(unicode);
if (escaped) {
#if PY_MAJOR_VERSION >= 3
escapedstr = std::string(PyBytes_AsString(escaped));
#else
escapedstr = std::string(PyString_AsString(escaped));
#endif
Py_DECREF(escaped);
}
@@ -173,20 +169,9 @@ std::string Base::Tools::escapedUnicodeToUtf8(const std::string& s)
PyObject* unicode = PyUnicode_DecodeUnicodeEscape(s.c_str(), s.size(), "strict");
if (!unicode)
return string;
#if PY_MAJOR_VERSION >= 3
if (PyUnicode_Check(unicode)) {
string = PyUnicode_AsUTF8(unicode);
}
#else
if (PyUnicode_Check(unicode)) {
PyObject* value = PyUnicode_AsUTF8String(unicode);
string = PyString_AsString(value);
Py_DECREF(value);
}
else if (PyString_Check(unicode)) {
string = PyString_AsString(unicode);
}
#endif
Py_DECREF(unicode);
return string;
}