updates to use clojure/ns

1 files changed, 8 insertions, 10 deletions

diff --git a/src/clojure/contrib/ns_utils/ns_utils.clj b/src/clojure/contrib/ns_utils/ns_utils.clj
index a165b1f8..aa3524cf 100644
--- a/src/clojure/contrib/ns_utils/ns_utils.clj
+++ b/src/clojure/contrib/ns_utils/ns_utils.clj
@@ -10,7 +10,7 @@
 ;;
 ;;  Namespace Utilities
 ;;
-;;    'ns'              returns the namespace named by a symbol or throws
+;;    'get-ns'          returns the namespace named by a symbol or throws
 ;;                      if the namespace does not exist
 ;;
 ;;    'ns-vars'         returns a sorted seq of symbols naming public vars
@@ -36,19 +36,17 @@
 ;;  scgilardi (gmail)
 ;;  23 April 2008
 
-(clojure/in-ns 'clojure.contrib.ns-utils)
-(clojure/refer 'clojure)
+(clojure/ns clojure.contrib.ns-utils
+ (:use clojure.contrib.except))
 
 ;; Namespace Utilities
 
-(defn ns
+(defn get-ns
   "Returns the namespace named by ns-sym or throws if the
   namespace does not exist"
   [ns-sym]
   (let [ns (find-ns ns-sym)]
-    (when-not ns
-      (throw (new Exception (str "Unable to find namespace: "
-                                 ns-sym))))
+    (throw-if (not ns) "Unable to find namespace: %s" ns-sym)
     ns))
 
 (defn ns-vars
@@ -75,14 +73,14 @@
   "Returns a sorted seq of symbols naming public vars in
   a namespace"
   [nsname]
-  `(ns-vars (ns '~nsname)))
+  `(ns-vars (get-ns '~nsname)))
 
 (defmacro dir
   "Prints a sorted directory of public vars in a namespace"
   [nsname]
-  `(print-dir (ns '~nsname)))
+  `(print-dir (get-ns '~nsname)))
 
 (defmacro docs
   "Prints documentation for the public vars in a namespace"
   [nsname]
-  `(print-docs (ns '~nsname)))
+  `(print-docs (get-ns '~nsname)))