improved functionality for working with PyObjectDerived iterators

Rob Levy · Rob Levy · commit bcbadd3eace1 · 2010-10-06T02:18:40.000-04:00
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject clojure-python "0.0.3"
+(defproject clojure-python "0.0.4"
   :description "Improve seamlessness of Clojure Jython interop."
   :dependencies [[org.clojure/clojure "1.1.0"]
                  [org.python/jython "2.5.1"]]
diff --git a/src/clojure_python/core.clj b/src/clojure_python/core.clj
@@ -77,29 +77,25 @@
 
 (defn dir 
   "it's slightly nicer to call the dir method in this way"
-  [x]
-  (seq (.__dir__ x)))
+  [x] (seq (.__dir__ x)))
+
+(defn pyobj-nth
+  "nth item in a 'PyObjectDerived'"
+  [o i] (.__getitem__ o i))
 
 (defn pyobj-range
-  "Access PyObjDerived items by range"
-  [o start end]
-  (for [i (range start end)]
-    (str (.__getitem__ o i))))
+  "access 'PyObjectDerived' items as non-lazy range"
+  [o start end] (for [i (range start end)] (pyobj-nth o i)))
 
-(defn pyobj-iterate [pyobj]
-  "Access 'PyObjectDerived' items as a Lazy Seq"
-  (let [iter (.__iter__ pyobj)]
-    (letfn
-     [(do-iter [iter]
-       (when (seq iter)
-         (lazy-seq
-          (cons (str (.__iternext__ iter))
-                (do-iter iter)))))]
-     (do-iter iter))))
+(defn pyobj-iterate
+  "access 'PyObjectDerived' items as Lazy Seq"
+   [pyobj] (lazy-seq (.__iter__ pyobj)))
 
 (defn java2py 
-  "to wrap java objects for input as jython, and unwrap jython output as java
-  (thanks to Marc Downie on Clojure list for suggesting this)"[args]
+  "to wrap java objects for input as jython, and unwrap
+  Jython output as java (thanks to Marc Downie on Clojure
+  list for suggesting this)"
+  [args]
   (into-array 
    org.python.core.PyObject 
    (map 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-(defproject clojure-python "0.0.3"`
	`1`	`+(defproject clojure-python "0.0.4"`
`2`	`2`	`:description "Improve seamlessness of Clojure Jython interop."`
`3`	`3`	`:dependencies [[org.clojure/clojure "1.1.0"]`
`4`	`4`	`[org.python/jython "2.5.1"]]`