updates to use clojure/ns

7 files changed, 20 insertions, 29 deletions

diff --git a/src/clojure/contrib/def/def.clj b/src/clojure/contrib/def/def.clj
index ee7b3386..1ca2c733 100644
--- a/src/clojure/contrib/def/def.clj
+++ b/src/clojure/contrib/def/def.clj
@@ -14,11 +14,12 @@
 ;;  scgilardi (gmail)
 ;;  17 May 2008
 
-(clojure/in-ns 'clojure.contrib.def)
-(clojure/refer 'clojure)
+(clojure/ns clojure.contrib.def)
 
 (defmacro init-once
-  "Initializes a var exactly once. The var must already exist."
+  "Initializes a var exactly once. The var must already exist.
+  (NOTE: Since SVN 1008, Clojure includes defonce. Please use that instead
+  of init-once.)"
   [var init]
   `(let [v# (resolve '~var)]
      (when-not (.isBound v#)
diff --git a/src/clojure/contrib/except/except.clj b/src/clojure/contrib/except/except.clj
index 6d59e412..8c1039e6 100644
--- a/src/clojure/contrib/except/except.clj
+++ b/src/clojure/contrib/except/except.clj
@@ -11,10 +11,7 @@
 ;;  scgilardi (gmail)
 ;;  Created 07 July 2008
 
-(clojure/in-ns 'clojure.contrib.except)
-(clojure/refer 'clojure)
-
-(clojure.contrib.lib/use '(clojure.contrib string))
+(clojure/ns clojure.contrib.except)
 
 (defn throw-if
   "Throws an exception with a message if pred is true. Arguments are:
diff --git a/src/clojure/contrib/lazy_seqs/lazy_seqs.clj b/src/clojure/contrib/lazy_seqs/lazy_seqs.clj
index 9ffd72f4..5e59bc08 100644
--- a/src/clojure/contrib/lazy_seqs/lazy_seqs.clj
+++ b/src/clojure/contrib/lazy_seqs/lazy_seqs.clj
@@ -32,10 +32,8 @@
 ;;  scgilardi (gmail)
 ;;  Created 07 June 2008
 
-(clojure/in-ns 'clojure.contrib.lazy-seqs)
-(clojure/refer 'clojure)
-
-(clojure.contrib.lib/use '(clojure.contrib def))
+(clojure/ns clojure.contrib.lazy-seqs
+ (:use clojure.contrib.def))
 
 (defvar primes
   (lazy-cat [2 3 5 7]
diff --git a/src/clojure/contrib/memoize/memoize.clj b/src/clojure/contrib/memoize/memoize.clj
index db782082..7af0a438 100644
--- a/src/clojure/contrib/memoize/memoize.clj
+++ b/src/clojure/contrib/memoize/memoize.clj
@@ -14,8 +14,7 @@
 ;;  Based on Common Lisp code from:
 ;;  http://asymmetrical-view.com/talks/lisp-presentation/lisp-presentation.pdf
 
-(clojure/in-ns 'clojure.contrib.memoize)
-(clojure/refer 'clojure)
+(clojure/ns clojure.contrib.memoize)
 
 (defn memoize
   "Returns a memoized version of a referentially transparent function. The
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)))
diff --git a/src/clojure/contrib/pred/pred.clj b/src/clojure/contrib/pred/pred.clj
index b654a5e8..85fcc257 100644
--- a/src/clojure/contrib/pred/pred.clj
+++ b/src/clojure/contrib/pred/pred.clj
@@ -13,8 +13,7 @@
 ;;  scgilardi (gmail)
 ;;  28 June 2008
 
-(clojure/in-ns 'clojure.contrib.pred)
-(clojure/refer 'clojure)
+(clojure/ns clojure.contrib.pred)
 
 (defn coll?
   "Returns true if x implements IPersistentCollection"
diff --git a/src/clojure/contrib/sql/sql.clj b/src/clojure/contrib/sql/sql.clj
index 1f81b9b8..0f8424a2 100644
--- a/src/clojure/contrib/sql/sql.clj
+++ b/src/clojure/contrib/sql/sql.clj
@@ -13,10 +13,9 @@
 ;;  scgilardi (gmail)
 ;;  23 April 2008
 
-(clojure/in-ns 'clojure.contrib.sql)
-(clojure/refer 'clojure)
-
-(import '(java.sql DriverManager Connection PreparedStatement ResultSet))
+(clojure/ns clojure.contrib.sql
+ (:import
+  (java.sql DriverManager Connection PreparedStatement ResultSet)))
 
 (defn get-connection
   "Attempts to get a connection to a database via a jdbc URL"