Update to work with R6 2.1.0

* eliminates warning message due to lock -> lock_objects * filters "clone" when creating mangled storr object
richfitz · Jul 5, 2015 · f95ee2e · f95ee2e
1 parent 2deab66
commit f95ee2e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -10,6 +10,6 @@ License: BSD_2_clause + file LICENSE
 LazyData: true
 Author: Rich FitzJohn
 Maintainer: Rich FitzJohn <rich.fitzjohn@gmail.com>
-Imports: R6, digest, httr, rappdirs
+Imports: R6 (>= 2.1.0), digest, httr, rappdirs
 Suggests: testthat, RedisAPI, rrlite, knitr, microbenchmark
 VignetteBuilder: knitr
diff --git a/R/driver_external.R b/R/driver_external.R
@@ -18,7 +18,7 @@ driver_external <- function(storage_driver, fetch_hook) {
 ##   just delete the key before even trying anything.
 .R6_driver_external <- R6::R6Class(
   "driver_external",
-  lock=FALSE,
+  lock_objects=FALSE,
 
   public=list(
     storage_driver=NULL,

diff --git a/R/storr.R b/R/storr.R
@@ -305,7 +305,7 @@ storr_mangled_methods <- function() {
               })
 
   public <- .R6_storr$public_methods
-  for (m in setdiff(names(public), "initialize")) {
+  for (m in setdiff(names(public), c("initialize", "clone"))) {
     f <- public[[m]]
     fun_name <- call("$", call("$", quote(self), quote(storr)), as.name(m))
     fun_args <- lapply(names(formals(f)), as.symbol)