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

Base: fix build failure for Py2

Browse Source
This commit is contained in:
wmayer
2020-06-30 10:27:53 +02:00
parent 8b2044aa13
commit 2b5ef38a86
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Base/Stream.cpp
View File

@@ -572,6 +572,7 @@ PyStreambuf::int_type PyStreambuf::underflow()
try {
std::string c;
Py::Object res(meth.apply(arg));
#if PY_MAJOR_VERSION >= 3
if (res.isBytes()) {
c = static_cast<std::string>(Py::Bytes(res));
}
@@ -582,7 +583,9 @@ PyStreambuf::int_type PyStreambuf::underflow()
// wrong type
return traits_type::eof();
}
#else
c = static_cast<std::string>(Py::String(res));
#endif
n = c.size();
if (n == 0) {
return traits_type::eof();
@@ -653,7 +656,11 @@ bool PyStreambuf::writeStr(const char* str, std::streamsize num)
return true;
}
else if (type == BytesIO) {
#if PY_MAJOR_VERSION >= 3
arg.setItem(0, Py::Bytes(str, num));
#else
arg.setItem(0, Py::String(str, num));
#endif
meth.apply(arg);
return true;
}
@@ -668,7 +675,11 @@ bool PyStreambuf::writeStr(const char* str, std::streamsize num)
catch (Py::Exception& e) {
if (PyErr_ExceptionMatches(PyExc_TypeError)) {
e.clear();
#if PY_MAJOR_VERSION >= 3
arg.setItem(0, Py::Bytes(str, num));
#else
arg.setItem(0, Py::String(str, num));
#endif
meth.apply(arg);
type = BytesIO;
return true;