From d9ab273d2ae66f03787a6475c3d293334f5e3ff7 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 7 Apr 2020 18:18:28 -0700
Subject: [PATCH] Revert last change, it was done that way for a reason

---
 src/arrays.sip | 52 ++++++--------------------------------------------
 1 file changed, 6 insertions(+), 46 deletions(-)

diff --git a/src/arrays.sip b/src/arrays.sip
index 8ed5870e..37dd09ef 100644
--- a/src/arrays.sip
+++ b/src/arrays.sip
@@ -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