make it possible to import submodules of modules

rplevy · rplevy · commit 4c552cb9dd4d · 2011-12-15T18:50:30.000-05:00
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-python "0.1.1"
+(defproject clojure-python "0.2.0"
   :description "Improve seamlessness of Clojure Jython interop."
   :dependencies [[org.clojure/clojure "1.3.0"]
                  [org.python/jython-standalone "2.5.2"]]
diff --git a/src/clojure_python/core.clj b/src/clojure_python/core.clj
@@ -1,4 +1,5 @@
 (ns clojure-python.core
+  (:require (clojure [string :as s]))
   (:import (org.python.util PythonInterpreter)
            (org.python.core.*)))
 
@@ -30,24 +31,31 @@
      (append-paths ~libpaths)
      ~@body))
 
-(defmacro py-import
-  "define a library using the same name it has in python
-  if multiple arguments are given, the first is assumed 
-  to be a library that has been imported, 
-  and the others are objects to import from this library"
-  ([lib] ; import a library
-     `(do (.exec *interp* (str "import " ~(name lib)))
-          (def ~lib
-               (-> *interp*
-                   .getLocals
-                   (.__getitem__ ~(name lib))
-                   .__dict__))))
-  ([lib & objects] ; import object from a library
-     (cons 'do
-           (map
-            (fn [obj]
-              `(def ~obj (.__finditem__ ~lib ~(name obj))))
-            objects))))
+(defmacro py-import-lib
+  "import lib
+  defaults to use same name it has in python
+  if it something like foo.bar, the name is bar."
+  [lib & libs]
+  (let [lib-sym (or (last libs) lib)
+        lib-strs (map name (cons lib libs))
+        py-name (s/join "." lib-strs)]
+    `(do (.exec *interp* (str "import " ~py-name))
+         (def ~lib-sym
+              (-> *interp*
+                  .getLocals
+                  (.__getitem__ ~(first lib-strs))
+                  ~@(map (fn [lib#] `(.__getattr__ ~lib#))
+                         (next lib-strs))
+                  .__dict__)))))
+
+(defmacro py-import-obj
+  "import objects from lib"
+  [lib obj & objs]
+  (cons 'do
+        (map
+         (fn [o#]
+           `(def ~o# (.__finditem__ ~lib ~(name o#)))))
+        (cons obj objs)))
 
 (defmacro py-fn 
   "create a native clojure function applying the python 
diff --git a/test/clojure_python/t_core.clj b/test/clojure_python/t_core.clj
@@ -41,29 +41,29 @@
 
 (fact "importing python modules works"
       (with-test-interp
-        (base/py-import example)
+        (base/py-import-lib example)
         (class example))
       =>
       org.python.core.PyStringMap)
 
 (fact "importing python functions works"
       (with-test-interp
-        (base/py-import example)
+        (base/py-import-lib example)
         (base/import-fn example hello)
         (fn? hello))
       =>
       true)
 
 (fact "calling python functions works"
       (with-test-interp
-        (base/py-import example)
+        (base/py-import-lib example)
         (base/import-fn example hello)
         (hello "world"))
       =>
       "hello, world how are you."
 
       (with-test-interp
-        (base/py-import example)
+        (base/py-import-lib example)
         ((base/py-fn example hello)
          "person"))
       =>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-(defproject clojure-python "0.1.1"`
	`1`	`+(defproject clojure-python "0.2.0"`
`2`	`2`	`:description "Improve seamlessness of Clojure Jython interop."`
`3`	`3`	`:dependencies [[org.clojure/clojure "1.3.0"]`
`4`	`4`	`[org.python/jython-standalone "2.5.2"]]`