Update zip-filter to use ns plus other changes to work with Clojure rev 1017

2 files changed, 7 insertions, 18 deletions

diff --git a/src/clojure/contrib/zip_filter/xml/xml.clj b/src/clojure/contrib/zip_filter/xml/xml.clj
index 16f67e8e..16f4154b 100644
--- a/src/clojure/contrib/zip_filter/xml/xml.clj
+++ b/src/clojure/contrib/zip_filter/xml/xml.clj
@@ -8,17 +8,10 @@
 
 ; Specialization of zip-filter for xml trees.
 
-(clojure/in-ns 'clojure.contrib.zip-filter.xml)
-(clojure/refer 'clojure)
-
-; load zip-filter if it isn't already -- when will lib.clj be guaranteed?
-(when-not (find-ns 'clojure.contrib.zip-filter)
-  (clojure.lang.RT/loadResourceScript
-    "clojure/contrib/zip_filter/zip_filter.clj"))
-
-(alias 'zf 'clojure.contrib.zip-filter)
-(alias 'zip 'clojure.zip)
-(alias 'xml 'clojure.xml)
+(ns clojure.contrib.zip-filter.xml
+    (:require [clojure.contrib.zip-filter :as zf]
+              [clojure.zip :as zip]
+              [clojure.xml :as xml]))
 
 (def xml->)
 
diff --git a/src/clojure/contrib/zip_filter/zip_filter.clj b/src/clojure/contrib/zip_filter/zip_filter.clj
index 76388c10..eb5d25c8 100644
--- a/src/clojure/contrib/zip_filter/zip_filter.clj
+++ b/src/clojure/contrib/zip_filter/zip_filter.clj
@@ -9,13 +9,9 @@
 ; System for filtering trees and nodes generated by zip.clj in
 ; general, and xml trees in particular.
 
-(clojure/in-ns 'clojure.contrib.zip-filter)
-(clojure/refer 'clojure :exclude '(descendants ancestors))
-(alias 'zip 'clojure.zip)
-
-(defn sequential?
-  "Returns true if x implements Sequential."
-  [x] (instance? clojure.lang.Sequential x))
+(ns clojure.contrib.zip-filter
+  (:refer-clojure :exclude (descendants ancestors))
+  (:require [clojure.zip :as zip]))
 
 ; This uses the negative form (no-auto) so that the result from any
 ; naive function, including user functions, defaults to "auto".