support single symbol imports, e.g. (import 'java.util.Date), patch from Meikel Brandmeyer

1 files changed, 13 insertions, 8 deletions

diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj
index fef9d2c1..cf19ec54 100644
--- a/src/clj/clojure/core.clj
+++ b/src/clj/clojure/core.clj
@@ -1591,14 +1591,19 @@
   For each name in class-name-symbols, adds a mapping from name to the
   class named by package.name to the current namespace. Use :import in the ns 
   macro in preference to calling this directly."  
-  [& import-lists]
-    (when import-lists
-      (let [#^clojure.lang.Namespace ns *ns*
-            pkg (ffirst import-lists)
-            classes (rfirst import-lists)]
-        (doseq [c classes]
-          (. ns (importClass c (. Class (forName (str pkg "." c)))))) )
-      (apply import (rest import-lists))))
+  [& import-symbols-or-lists]
+    (let [#^clojure.lang.Namespace ns *ns*]
+      (doseq [spec import-symbols-or-lists]
+        (if (symbol? spec)
+          (let [n (name spec)
+                dot (.lastIndexOf n (. clojure.lang.RT (intCast \.)))
+                c (symbol (.substring n (inc dot)))]
+            (. ns (importClass c (. Class (forName (name spec))))))
+          (let [pkg (first spec)
+                classes (rest spec)]
+            (doseq [c classes]
+              (. ns (importClass c (. Class (forName (str pkg "." c)))))))))))
+
 
 (defn into-array
   "Returns an array with components set to the values in aseq. The array's