|
23 | 23 | // Code to test a PyObject for compatibility
|
24 | 24 | // Verify that the object is a sequence, but not bytes or unicode
|
25 | 25 | if (!sipIsErr) {
|
26 |
| - if (PySequence_Check(sipPy) && |
27 |
| - !(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))) { |
28 |
| - |
29 |
| - Py_ssize_t i, len = PySequence_Length(sipPy); |
30 |
| - bool failed; |
31 |
| - for (i=0; i<len; i++) { |
32 |
| - PyObject* item = PySequence_GetItem(sipPy, i); |
33 |
| - failed = !PyBytes_Check(item) && !PyUnicode_Check(item); |
34 |
| - Py_DECREF(item); |
35 |
| - if (failed) |
36 |
| - return FALSE; |
37 |
| - } |
38 |
| - return TRUE; |
39 |
| - } |
40 |
| - return FALSE; |
41 |
| - |
| 26 | + return (PySequence_Check(sipPy) && |
| 27 | + !(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))); |
42 | 28 | }
|
43 | 29 |
|
44 | 30 |
|
@@ -123,21 +109,8 @@ wxArrayString testArrayStringTypemap(const wxArrayString& arr);
|
123 | 109 | %ConvertToTypeCode
|
124 | 110 | // Code to test a PyObject for compatibility
|
125 | 111 | if (!sipIsErr) {
|
126 |
| - if (PySequence_Check(sipPy) && |
127 |
| - !(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))) { |
128 |
| - |
129 |
| - Py_ssize_t i, len = PySequence_Length(sipPy); |
130 |
| - bool failed; |
131 |
| - for (i=0; i<len; i++) { |
132 |
| - PyObject* item = PySequence_GetItem(sipPy, i); |
133 |
| - failed = !PyNumber_Check(item); |
134 |
| - Py_DECREF(item); |
135 |
| - if (failed) |
136 |
| - return FALSE; |
137 |
| - } |
138 |
| - return TRUE; |
139 |
| - } |
140 |
| - return FALSE; |
| 112 | + return (PySequence_Check(sipPy) && |
| 113 | + !(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))); |
141 | 114 | }
|
142 | 115 |
|
143 | 116 | // Code to create a new wxArrayInt and convert a compatible PyObject
|
@@ -209,21 +182,8 @@ wxArrayInt testArrayIntTypemap(const wxArrayInt& arr);
|
209 | 182 | %ConvertToTypeCode
|
210 | 183 | // Code to test a PyObject for compatibility
|
211 | 184 | if (!sipIsErr) {
|
212 |
| - if (PySequence_Check(sipPy) && |
213 |
| - !(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))) { |
214 |
| - |
215 |
| - Py_ssize_t i, len = PySequence_Length(sipPy); |
216 |
| - bool failed; |
217 |
| - for (i=0; i<len; i++) { |
218 |
| - PyObject* item = PySequence_GetItem(sipPy, i); |
219 |
| - failed = !PyNumber_Check(item); |
220 |
| - Py_DECREF(item); |
221 |
| - if (failed) |
222 |
| - return FALSE; |
223 |
| - } |
224 |
| - return TRUE; |
225 |
| - } |
226 |
| - return FALSE; |
| 185 | + return (PySequence_Check(sipPy) && |
| 186 | + !(PyBytes_Check(sipPy) || PyUnicode_Check(sipPy))); |
227 | 187 | }
|
228 | 188 |
|
229 | 189 | // Code to create a new wxArrayDouble and convert a compatible PyObject
|
|
0 commit comments