get rid of xfun::attr(): yihui/xfun#96

yihui · Jan 6, 2025 · 35308a2 · 35308a2
1 parent 4510c09
commit 35308a2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: knitr
 Type: Package
 Title: A General-Purpose Package for Dynamic Report Generation in R
-Version: 1.49.1
+Version: 1.49.2
 Authors@R: c(
     person("Yihui", "Xie", role = c("aut", "cre"), email = "xie@yihui.name", comment = c(ORCID = "0000-0003-0645-5666")),
     person("Abhraneel", "Sarma", role = "ctb"),

diff --git a/NAMESPACE b/NAMESPACE
@@ -153,7 +153,6 @@ import(grDevices)
 import(graphics)
 import(stats)
 import(utils)
-importFrom(xfun,attr)
 importFrom(xfun,file_ext)
 importFrom(xfun,file_string)
 importFrom(xfun,html_escape)

diff --git a/R/package.R b/R/package.R
@@ -24,7 +24,7 @@
 #'   \code{knit} + \code{R} (while \code{Sweave} = \code{S} + \code{weave}).
 #' @references Full documentation and demos: \url{https://yihui.org/knitr/};
 #'   FAQ's: \url{https://yihui.org/knitr/faq/}
-#' @importFrom xfun attr file_ext html_escape is_windows loadable parse_only
+#' @importFrom xfun file_ext html_escape is_windows loadable parse_only
 #'   sans_ext try_silent with_ext read_utf8 write_utf8 file_string
 #'   is_R_CMD_check is_abs_path
 '_PACKAGE'

diff --git a/R/utils.R b/R/utils.R
@@ -47,6 +47,9 @@ comment_to_var = function(x, varname, pattern, envir) {
 is_blank = function(x) {
   if (length(x)) all(grepl('^\\s*$', x)) else TRUE
 }
+
+attr = function(...) base::attr(..., exact = TRUE)
+
 valid_path = function(prefix, label) {
   if (length(prefix) == 0L || is.na(prefix) || prefix == 'NA') prefix = ''
   paste0(prefix, label)

diff --git a/knitr.Rproj b/knitr.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: aebca7ed-54a0-42eb-85a8-80428da985f9
 
 RestoreWorkspace: Default
 SaveWorkspace: Default