bug apply simplify in older R versions

vincentarelbundock · Apr 2, 2024 · 29b5b34 · 29b5b34
1 parent 7d3b82d
commit 29b5b34
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: countrycode
 Title: Convert Country Names and Country Codes
-Version: 1.6.0
+Version: 1.6.0.9000
 Authors@R: 
     c(person(given = "Vincent",
              family = "Arel-Bundock",

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,9 @@
 # News
 
+## development
+
+* The `simplify` argument in `apply` was introduced in R 4.1.0. We used it, which broke usage of countrycode on older versions of R.
+
 ## countrycode 1.6.0
 
 * Important speed-up for detection of country names using regular expressions (Thanks to Etienne Bacher).

diff --git a/R/countrycode.R b/R/countrycode.R
@@ -269,7 +269,13 @@ countrycode_convert <- function(# user-supplied arguments
         if (all(is.na(choices))) {
             matches <- vector("list", length = length(choices))
         } else {
-            out <- apply(matchidx, 1, which, simplify = FALSE)
+            # Issue reported to Vincent by email
+            # simplify=FALSE was introduced in R 4.1.0. we want coverage before
+            # out <- try(apply(matchidx, 1, which, simplify = FALSE))
+            out <- apply(matchidx, 1, which)
+            if (length(out) == 0) {
+                out <- rep(list(NULL), nrow(matchidx))
+            }
             names(out) <- choices
             matches <- lapply(out, function(x) dict[x, destination])
         }