luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Python 3.10 builds

This commit is contained in:
Matthias Koefferlein 2022-02-05 19:46:53 +01:00
parent 2d20614531
commit ffb81a66ea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pya/pya/pyaConvert.cc
View File

@ -203,7 +203,7 @@ std::vector<char> python2c_func<std::vector<char> >::operator() (PyObject *rval)
#else #else
if (PyBytes_Check (rval)) { if (PyBytes_Check (rval)) {
char *cp = 0; char *cp = 0;
ssize_t sz = 0; Py_ssize_t sz = 0;
PyBytes_AsStringAndSize (rval, &cp, &sz); PyBytes_AsStringAndSize (rval, &cp, &sz);
tl_assert (cp != 0); tl_assert (cp != 0);
return std::vector<char> (cp, cp + sz); return std::vector<char> (cp, cp + sz);
@ -215,13 +215,13 @@ std::vector<char> python2c_func<std::vector<char> >::operator() (PyObject *rval)
check_error (); check_error ();
} }
char *cp = 0; char *cp = 0;
ssize_t sz = 0; Py_ssize_t sz = 0;
PyBytes_AsStringAndSize (ba.get (), &cp, &sz); PyBytes_AsStringAndSize (ba.get (), &cp, &sz);
tl_assert (cp != 0); tl_assert (cp != 0);
return std::vector<char> (cp, cp + sz); return std::vector<char> (cp, cp + sz);
} else if (PyByteArray_Check (rval)) { } else if (PyByteArray_Check (rval)) {
char *cp = PyByteArray_AsString (rval); char *cp = PyByteArray_AsString (rval);
ssize_t sz = PyByteArray_Size (rval); Py_ssize_t sz = PyByteArray_Size (rval);
return std::vector<char> (cp, cp + sz); return std::vector<char> (cp, cp + sz);
} else { } else {
throw tl::Exception (tl::to_string (tr ("Argument cannot be converted to a byte array"))); throw tl::Exception (tl::to_string (tr ("Argument cannot be converted to a byte array")));