Quieting failures when something passes the sequence check.

cnuernber · cnuernber · commit c40ebabbe3ef · 2021-03-09T07:37:15.000-07:00
diff --git a/src/libpython_clj2/python.clj b/src/libpython_clj2/python.clj
@@ -616,7 +616,7 @@ user> (py/call-attr inst \"addarg\" 10)
                              (catch Throwable e nil))]
       (if reload?
         (let [import-lib (import-module "importlib")]
-          (call-attr import-lib "reload" item-path))
+          (call-attr import-lib "reload" module-retval))
         module-retval)
       (let [butlast (module-path-string item-path)]
         (if-let [parent-mod (path->py-obj butlast :reload? reload?)]
diff --git a/src/libpython_clj2/python/copy.clj b/src/libpython_clj2/python/copy.clj
@@ -39,13 +39,18 @@
   (when-not (= 1 (py-ffi/PySequence_Check pyobj))
     (errors/throwf "Object does not implement sequence protocol: %s"
                    (py-proto/python-type pyobj)))
-  (->> (range (py-ffi/PySequence_Length pyobj))
-       (mapv (fn [idx]
-               (let [pyitem (py-ffi/PySequence_GetItem pyobj idx)]
-                 (try
-                   (py-base/->jvm pyitem)
-                   (finally
-                     (py-ffi/Py_DecRef pyitem))))))))
+  ;; Unfortunately sometimes things that pass the sequence check will fail
+  ;; when you request their length.  In those cases we return an empty vector
+  ;; as that is what older versions of libpython-clj would do.
+  (try
+    (->> (range (py-ffi/with-error-check (py-ffi/PySequence_Length pyobj)))
+         (mapv (fn [idx]
+                 (let [pyitem (py-ffi/PySequence_GetItem pyobj idx)]
+                   (try
+                     (py-base/->jvm pyitem)
+                     (finally
+                       (py-ffi/Py_DecRef pyitem)))))))
+    (catch Throwable e [])))
 
 
 (defmethod py-proto/pyobject->jvm :str
@@ -176,16 +181,17 @@
     ;;Things could implement mapping and sequence logically so mapping
     ;;takes precedence
     (= 1 (py-ffi/PyMapping_Check pyobj))
-    (if-let [map-items (py-ffi/PyMapping_Items pyobj)]
-      (try
-        (python->jvm-copy-hashmap pyobj map-items)
-        (finally
-          (py-ffi/Py_DecRef map-items)))
-      (do
-        ;;Ignore error.  The mapping check isn't thorough enough to work for all
-        ;;python objects.
-        (py-ffi/PyErr_Clear)
-        (python->jvm-copy-persistent-vector pyobj)))
+    (do
+      (if-let [map-items (py-ffi/PyMapping_Items pyobj)]
+        (try
+          (python->jvm-copy-hashmap pyobj map-items)
+          (finally
+            (py-ffi/Py_DecRef map-items)))
+        (do
+          ;;Ignore error.  The mapping check isn't thorough enough to work for all
+          ;;python objects.
+          (py-ffi/PyErr_Clear)
+          (python->jvm-copy-persistent-vector pyobj))))
     ;;Sequences become persistent vectors
     (= 1 (py-ffi/PySequence_Check pyobj))
     (python->jvm-copy-persistent-vector pyobj)
