Adding nil test for ->jvm and as-jvm. maps use getordefault for ifn overload now, and example of bridge.

cnuernber · cnuernber · commit 211b81cd274e · 2019-11-22T13:54:05.000-07:00
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject cnuernber/libpython-clj "1.9"
+(defproject cnuernber/libpython-clj "1.10-SNAPSHOT"
   :description "libpython bindings to the techascent ecosystem"
   :url "http://github.com/cnuernber/libpython-clj"
   :license {:name "EPL-2.0"
diff --git a/src/libpython_clj/python.clj b/src/libpython_clj/python.clj
@@ -50,7 +50,8 @@
 
 
 (export-symbols libpython-clj.python.interop
-                libpython-clj-module-name)
+                libpython-clj-module-name
+                create-bridge-from-att-map)
 
 
 (export-symbols libpython-clj.python.bridge
diff --git a/src/libpython_clj/python/bridge.clj b/src/libpython_clj/python/bridge.clj
@@ -292,7 +292,7 @@
 (defn- py-impl-call-raw
   [att-name att-map arglist]
   (if-let [py-fn (get att-map att-name)]
-    (-> (py-proto/do-call-fn py-fn (map as-python arglist) nil))
+    (py-proto/do-call-fn py-fn (map as-python arglist) nil)
     (throw (UnsupportedOperationException.
             (format "Python object has no attribute: %s"
                     att-name)))))
@@ -371,7 +371,7 @@
                               (MapEntry. k v))))))]
           (.iterator ^Iterable mapentry-seq)))
        IFn
-       (invoke [this arg] (.get this arg))
+       (invoke [this arg] (.getOrDefault this arg nil))
        (invoke [this k v] (.put this k v))
        (applyTo [this arglist]
                 (let [arglist (vec arglist)]
diff --git a/src/libpython_clj/python/object.clj b/src/libpython_clj/python/object.clj
@@ -91,7 +91,8 @@
 (defn ->jvm
   "Copy an object into the jvm (if it wasn't there already.)"
   [item & [options]]
-  (py-proto/->jvm item options))
+  (when item
+    (py-proto/->jvm item options)))
 
 
 (def ^:dynamic *object-reference-logging* false)
diff --git a/test/libpython_clj/python_test.clj b/test/libpython_clj/python_test.clj
@@ -197,3 +197,54 @@
                (py/call-attr item "doit_noerr"))
       (is (= ["enter" "exit: None"]
              (py/->jvm fn-list))))))
+
+
+(deftest arrow-as-fns-with-nil
+  (py/initialize!)
+  (is (= nil (py/->jvm nil)))
+  (is (= nil (py/as-jvm nil))))
+
+
+(deftest pydict-nil-get
+  (py/initialize!)
+  (let [dict (py/->python {:a 1 :b {:a 1 :b 2}})
+        bridged (py/as-jvm dict)]
+    (is (= nil (bridged nil)))))
+
+
+(deftest custom-clojure-item
+  (let [att-map {"clojure_fn" (py/->python #(vector 1 2 3))}
+        my-python-item (py/create-bridge-from-att-map
+                        ;;First is the jvm object that this bridge stands for.  If this
+                        ;;gets garbage collected then the python side will be removed
+                        ;;also.
+                        att-map
+                        ;;second is the list of attributes.  In this case, since this
+                        ;;object isn't iterable or anything, this function will do.
+                        att-map
+                        )
+        py-mod (py/import-module "testcode")]
+    (is (= [1 2 3]
+           (py/call-attr py-mod "calling_custom_clojure_fn" my-python-item)))
+
+    ;;Now this case is harder.  Let's say we have something that is iterable and we
+    ;;want this to be reflected in python.  In that case we have to call 'as-python'
+    ;;on the iterator and that 'should' work.
+
+    (let [my-obj (reify
+                   Iterable
+                   (iterator [this] (.iterator [4 5 6])))
+          ;;Note that attributes themselves have to be python objects and wrapping
+          ;;this with as-python makes that function wrap whatever it returns in a
+          ;;bridging python object also.
+          att-map {"__iter__" (py/as-python #(.iterator my-obj))}
+          my-python-item (py/create-bridge-from-att-map
+                          my-obj
+                          ;;second is the list of attributes.  In this case, since this
+                          ;;object isn't iterable or anything, this function will do.
+                          att-map
+                          )]
+      (is (= [4 5 6]
+             (vec my-obj)))
+      (is (= [4 5 6]
+             (vec (py/call-attr py-mod "for_iter" my-python-item)))))))
diff --git a/testcode/__init__.py b/testcode/__init__.py
@@ -18,3 +18,7 @@ def for_iter(arg):
     for item in arg:
         retval.append(item)
     return retval
+
+
+def calling_custom_clojure_fn(arg):
+    return arg.clojure_fn()

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-(defproject cnuernber/libpython-clj "1.9"`
	`1`	`+(defproject cnuernber/libpython-clj "1.10-SNAPSHOT"`
`2`	`2`	`:description "libpython bindings to the techascent ecosystem"`
`3`	`3`	`:url "http://github.com/cnuernber/libpython-clj"`
`4`	`4`	`:license {:name "EPL-2.0"`