Skip to content

Make delim a keyword argument #60

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 31, 2019
Merged

Make delim a keyword argument #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ df = DataFrame(load(Stream(format"CSV", io)))
The ``load`` function also takes a number of parameters:

````julia
load(f::FileIO.File{FileIO.format"CSV"}, delim=','; <arguments>...)
load(f::FileIO.File{FileIO.format"CSV"}; <arguments>...)
````
#### Arguments:

Expand Down
28 changes: 24 additions & 4 deletions src/CSVFiles.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,39 @@ end

Base.showable(::MIME"application/vnd.dataresource+json", source::CSVStream) = true

function fileio_load(f::FileIO.File{FileIO.format"CSV"}, delim=','; args...)
function fileio_load(f::FileIO.File{FileIO.format"CSV"}, deprecated_delim=nothing; delim=deprecated_delim===nothing ? ',' : deprecated_delim, args...)
if deprecated_delim!==nothing
deprecated_delim!=delim && error("deprecated_delim and delim can not both be used at the same time.")
Base.depwarn("The positional `delim` keyword in the `load` function is deprecated. Instead use the keyword argument `delim`.", :CSVFiles)
end

return CSVFile(f.filename, delim, args)
end

function fileio_load(f::FileIO.File{FileIO.format"TSV"}, delim='\t'; args...)
function fileio_load(f::FileIO.File{FileIO.format"TSV"}, deprecated_delim=nothing; delim=deprecated_delim===nothing ? '\t' : deprecated_delim, args...)
if deprecated_delim!==nothing
deprecated_delim!=delim && error("deprecated_delim and delim can not both be used at the same time.")
Base.depwarn("The positional `delim` keyword in the `load` function is deprecated. Instead use the keyword argument `delim`.", :CSVFiles)
end

return CSVFile(f.filename, delim, args)
end

function fileio_load(s::FileIO.Stream{FileIO.format"CSV"}, delim=','; args...)
function fileio_load(s::FileIO.Stream{FileIO.format"CSV"}, deprecated_delim=nothing; delim=deprecated_delim===nothing ? ',' : deprecated_delim, args...)
if deprecated_delim!==nothing
deprecated_delim!=delim && error("deprecated_delim and delim can not both be used at the same time.")
Base.depwarn("The positional `delim` keyword in the `load` function is deprecated. Instead use the keyword argument `delim`.", :CSVFiles)
end

return CSVStream(s.io, delim, args)
end

function fileio_load(s::FileIO.Stream{FileIO.format"TSV"}, delim='\t'; args...)
function fileio_load(s::FileIO.Stream{FileIO.format"TSV"}, deprecated_delim=nothing; delim=deprecated_delim===nothing ? '\t' : deprecated_delim, args...)
if deprecated_delim!==nothing
deprecated_delim!=delim && error("deprecated_delim and delim can not both be used at the same time.")
Base.depwarn("The positional `delim` keyword in the `load` function is deprecated. Instead use the keyword argument `delim`.", :CSVFiles)
end

return CSVStream(s.io, delim, args)
end

Expand Down