Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-07 20:40:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert last change, it was done that way for a reason

Browse Source
This commit is contained in:
Robin Dunn
2020-04-07 18:18:28 -07:00
parent bf0d0fc027
commit d9ab273d2a
1 changed files with 6 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/arrays.sip
View File

@@ -23,22 +23,8 @@
// Code to test a PyObject for compatibility
// Verify that the object is a sequence, but not bytes or unicode
if (!sipIsErr) {
if (PySequence_Check(sipPy) &&
!(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))) {
Py_ssize_t i, len = PySequence_Length(sipPy);
bool failed;
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(sipPy, i);
failed = !PyBytes_Check(item) && !PyUnicode_Check(item);
Py_DECREF(item);
if (failed)
return FALSE;
}
return TRUE;
}
return FALSE;
return (PySequence_Check(sipPy) &&
!(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy)));
}
@@ -123,21 +109,8 @@ wxArrayString testArrayStringTypemap(const wxArrayString& arr);
%ConvertToTypeCode
// Code to test a PyObject for compatibility
if (!sipIsErr) {
if (PySequence_Check(sipPy) &&
!(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))) {
Py_ssize_t i, len = PySequence_Length(sipPy);
bool failed;
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(sipPy, i);
failed = !PyNumber_Check(item);
Py_DECREF(item);
if (failed)
return FALSE;
}
return TRUE;
}
return FALSE;
return (PySequence_Check(sipPy) &&
!(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy)));
}
// Code to create a new wxArrayInt and convert a compatible PyObject
@@ -209,21 +182,8 @@ wxArrayInt testArrayIntTypemap(const wxArrayInt& arr);
%ConvertToTypeCode
// Code to test a PyObject for compatibility
if (!sipIsErr) {
if (PySequence_Check(sipPy) &&
!(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))) {
Py_ssize_t i, len = PySequence_Length(sipPy);
bool failed;
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(sipPy, i);
failed = !PyNumber_Check(item);
Py_DECREF(item);
if (failed)
return FALSE;
}
return TRUE;
}
return FALSE;
return (PySequence_Check(sipPy) &&
!(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy)));
}
// Code to create a new wxArrayDouble and convert a compatible PyObject