better way of writing this macro

rplevy · rplevy · commit 1c7a55f890a2 · 2011-12-14T17:15:48.000-05:00
diff --git a/project.clj b/project.clj
@@ -1,6 +1,6 @@
-(defproject clojure-python "0.1.0"
+(defproject clojure-python "0.1.1"
   :description "Improve seamlessness of Clojure Jython interop."
   :dependencies [[org.clojure/clojure "1.3.0"]
                  [org.python/jython-standalone "2.5.2"]]
-  :dev-dependencies [[midje "1.3.0-RC4"]]
+  :dev-dependencies [[midje "1.3.0"]]
   :main clojure-python.core)
diff --git a/src/clojure_python/core.clj b/src/clojure_python/core.clj
@@ -34,21 +34,21 @@
   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"
-  ([] nil)
   ([lib] ; import a library
      `(do (.exec *interp* (str "import " ~(name lib)))
           (def ~lib
                (-> *interp*
                    .getLocals
                    (.__getitem__ ~(name lib))
-                   .__dict__))
-          (print ~lib)))
-  ([lib object] ; import object from a library
-     `(do (def ~object (.__finditem__ ~lib ~(name object)))
-          (print ~object)))
-  ([lib object & more-objects] ; import multiple objects
-     `(do (py-import ~lib ~object) 
-          (py-import ~lib ~@more-objects))))
+                   .__dict__)))
+     (print ~lib))
+  ([lib & objects] ; import object from a library
+     (cons 'do
+           (mapcat 
+            (fn [obj]
+              `((def ~obj (.__finditem__ ~lib ~(name obj)))
+                (print ~obj)))
+            objects))))
 
 (defmacro import-fn 
   "this is like import but it defines the imported item 
