Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalize all paths, prior conversion to native encoding #499

Merged
merged 1 commit into from
Aug 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# readxl 1.1.0.9000
# readxl *development version*

* readxl has a new vignette on reading excel files with multiple header rows, contributed by @apreshill. (#486, #492)

Expand All @@ -12,10 +12,9 @@

## Other changes

* Path handling (#477):
* Path handling:

- `.xls` paths are no longer normalized. (#476 xls)
- All paths are explicitly converted to the native encoding via `enc2native()` (#370)
- All paths are passed through `normalizePath()` (#498, #499, new behaviour for xlsx but not xls) and `enc2native()` (#370).

# readxl 1.1.0

Expand Down
2 changes: 1 addition & 1 deletion R/read_excel.R
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ read_excel_ <- function(path, sheet = NULL, range = NULL,
tibble::set_tidy_names(
tibble::as_tibble(
read_fun(
path = enc2native(path), sheet_i = sheet,
path = enc2native(normalizePath(path)), sheet_i = sheet,
limits = limits, shim = shim,
col_names = col_names, col_types = col_types,
na = na, trim_ws = trim_ws, guess_max = guess_max
Expand Down