r-lib · lionel- · Jun 29, 2022 · Jun 28, 2022 · Jun 28, 2022 · Jun 29, 2022
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -33,4 +33,4 @@ Config/testthat/edition: 3
 Config/Needs/website: tidyverse/tidytemplate
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.2.9000
+RoxygenNote: 7.2.0
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,6 +1,7 @@
 # Generated by roxygen2: do not edit by hand
 
 S3method(as_iterator,default)
+S3method(as_iterator,python.builtin.object)
 S3method(print,coro_async)
 S3method(print,coro_async_generator)
 S3method(print,coro_generator)

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
 # coro (development version)
 
+* `coro::as_iterator()` method added for reticulate Python objects, enabling
+  usage like: `coro::loop(for (elem in my_py_object) ...)` (#37, @t-kalinowski)
+
 # coro 1.0.2
 
 * The exhaustion sentinel is now `as.symbol(".__exhausted__.")`

diff --git a/R/iterator.R b/R/iterator.R
@@ -136,12 +136,10 @@ as_iterator.default <- function(x) {
   }
 }
 
-on_load(on_package_load("reticulate", {
-  if (!s3_has_method("coro::as_iterator", "python.builtin.iterator")) {
-    s3_register("coro::as_iterator", "python.builtin.iterator", function(x) {
-      function() {
-        reticulate::iter_next(x, completed = exhausted())
-      }
-    })
-  }
-}))
+
+
+#' @export
+as_iterator.python.builtin.object <- function(x) {
+  x <- reticulate::as_iterator(x)
+  function() reticulate::iter_next(x, exhausted())
+}
diff --git a/flowery.Rproj → coro.Rproj b/flowery.Rproj → coro.Rproj
@@ -5,8 +5,13 @@ SaveWorkspace: No
 AlwaysSaveHistory: Default
 
 EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
 Encoding: UTF-8
 
+RnwWeave: Sweave
+LaTeX: pdfLaTeX
+
 AutoAppendNewline: Yes
 StripTrailingWhitespace: Yes
 

diff --git a/man/iterator.Rd b/man/iterator.Rd
diff --git a/tests/testthat/test-iterator.R b/tests/testthat/test-iterator.R
@@ -21,4 +21,21 @@ def first_n(n):
     out <- c(out, x)
   })
   expect_equal(out, 1:3)
+
+
+})
+
+
+test_that("can use reticulate iteratables", {
+  skip_if_not_installed("reticulate")
+  skip_on_cran()
+  skip_on_ci()
+
+  i <- 0L
+  loop(for (el in reticulate::py_eval("range(3)")) {
+    i <- i + el
+  })
+  expect_equal(i, 3L)
 })
+
+