Fixes #126

cnuernber · cnuernber · commit c71d67465c3c · 2021-05-16T10:08:42.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Time for a ChangeLog!
 
+## 2.00-beta-19
+ * [issue 126](https://github.com/clj-python/libpython-clj/issues/126) - Python maps sometimes fail to destructure.
+
 ## 2.00-beta-18
  * Additional fix for 162 to allow booleans to be considered primitives and be output inline.
  * Experimental fix for [issue 164](https://github.com/clj-python/libpython-clj/issues/164) - Unsigned int64 fails with
diff --git a/deps.edn b/deps.edn
@@ -1,6 +1,6 @@
 {:paths ["src"]
  :deps {org.clojure/clojure  {:mvn/version "1.10.2" :scope "provided"}
-        cnuernber/dtype-next {:mvn/version "7.13"}
+        cnuernber/dtype-next {:mvn/version "8.00"}
         net.java.dev.jna/jna {:mvn/version "5.7.0"}
         org.clojure/data.json  {:mvn/version "1.0.0"}}
 
diff --git a/src/libpython_clj2/python/bridge_as_jvm.clj b/src/libpython_clj2/python/bridge_as_jvm.clj
@@ -310,7 +310,10 @@
                iterator-seq
                set)))
        (get [this obj-key]
-            (py-call "__getitem__" obj-key))
+            ;;Specifically return nil to match java map expectations
+            ;;and thus allow destructuring.
+            (when (py-call "__contains__" obj-key)
+              (py-call "__getitem__" obj-key)))
        (getOrDefault [item obj-key obj-default-value]
                      (if (.containsKey item obj-key)
                        (.get item obj-key)
diff --git a/test/libpython_clj2/python_test.clj b/test/libpython_clj2/python_test.clj
@@ -407,6 +407,13 @@ class Foo:
     (is (= 8 (py/call-attr py-data "__len__")))))
 
 
+(deftest python-as-jvm-destructuring
+  (let [py-dict (py/->python {:a 1})
+        jvm-py-dict (py/as-jvm py-dict)
+        {:keys [a b]} jvm-py-dict]
+    (is (nil? b))))
+
+
 (comment
   (require '[libpython-clj.require :refer [require-python]])
 
