Merge pull request #62 from JuliaIO/yyc/0.5-depwarn

Fix depwarn on 0.5.

Author: SimonDanisch

.travis.yml

@@ -5,6 +5,7 @@ os:
 julia:
   - 0.3
   - 0.4
+  - nightly
 notifications:
   email: false
 script:

REQUIRE

@@ -1,4 +1,4 @@
 julia 0.3
+Compat 0.7.15
 # The rest are needed only on julia 0.3
-Compat
 Docile

appveyor.yml

@@ -2,6 +2,8 @@ environment:
   matrix:
   - JULIAVERSION: "julialang/bin/winnt/x86/0.3/julia-0.3-latest-win32.exe"
   - JULIAVERSION: "julialang/bin/winnt/x64/0.3/julia-0.3-latest-win64.exe"
+  - JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
+  - JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
   - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
   - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
 

docs/make_docs.jl

@@ -1,4 +1,5 @@
 using FileIO, Compat
+import Compat.String
 import FileIO: LOAD, SAVE, OSX, OS
 const fs = open(Pkg.dir("FileIO", "docs", "registry.md"), "w")
 
@@ -43,7 +44,7 @@ function add_format{Sym}(::Type{DataFormat{Sym}}, magic, extension, io_libs...)
 end
 
 
-function add_format{sym}(fmt::Type{DataFormat{sym}}, magic::@compat(Union{Tuple,AbstractVector,ByteString}), extension)
+function add_format{sym}(fmt::Type{DataFormat{sym}}, magic::@compat(Union{Tuple,AbstractVector,String}), extension)
     println(sym)
 end
 

src/FileIO.jl

@@ -2,6 +2,7 @@ VERSION >= v"0.4.0-dev+6641" && __precompile__()
 
 module FileIO
 using Compat
+import Compat.String
 
 if VERSION < v"0.4.0-dev"
     using Docile

src/error_handling.jl

@@ -1,12 +1,11 @@
-
 @doc """
 `LoaderError` should be thrown when loader library code fails, and other libraries should
 be given the chance to recover from the error.  Reports the library name and an error message:
 LoaderError("ImageMagick", "Foo not available")
 """ ->
 immutable LoaderError <: Exception
-    library::UTF8String
-    msg::UTF8String
+    library::Compat.UTF8String
+    msg::Compat.UTF8String
 end
 Base.showerror(io::IO, e::LoaderError) = println(io, e.library, " load error: ",
                                                  msg, "\n  Will try next loader.")
@@ -17,8 +16,8 @@ be given the chance to recover from the error.  Reports the library name and an
 WriterError("ImageMagick", "Foo not available")
 """ ->
 immutable WriterError <: Exception
-    library::UTF8String
-    msg::UTF8String
+    library::Compat.UTF8String
+    msg::Compat.UTF8String
 end
 Base.showerror(io::IO, e::WriterError) = println(
     io, e.library, " writer error: ",
@@ -30,7 +29,7 @@ Base.showerror(io::IO, e::WriterError) = println(
 """ ->
 immutable NotInstalledError <: Exception
     library::Symbol
-    message::UTF8String
+    message::Compat.UTF8String
 end
 Base.showerror(io::IO, e::NotInstalledError) = println(io, e.library, " is not installed.")
 

src/query.jl

@@ -39,7 +39,7 @@ An easy way to write `DataFormat{:CSV}` is `format"CSV"`.
 immutable DataFormat{sym} end
 
 macro format_str(s)
-    :(DataFormat{$(Expr(:quote, symbol(s)))})
+    :(DataFormat{$(Expr(:quote, @compat Symbol(s)))})
 end
 
 const unknown_df = DataFormat{:UNKNOWN}
@@ -49,7 +49,7 @@ const unknown_df = DataFormat{:UNKNOWN}
 unknown(::Type{format"UNKNOWN"})    = true
 unknown{sym}(::Type{DataFormat{sym}}) = false
 
-const ext2sym    = Dict{ASCIIString, @compat(Union{Symbol,Vector{Symbol}})}()
+const ext2sym    = Dict{String, @compat(Union{Symbol,Vector{Symbol}})}()
 const magic_list = Array(Pair, 0)    # sorted, see magic_cmp below
 const sym2info   = Dict{Symbol,Any}()  # Symbol=>(magic, extension)
 const magic_func = Array(Pair, 0)    # for formats with complex magic #s
@@ -73,7 +73,7 @@ For example:
 
 Note that extensions, magic numbers, and format-identifiers are case-sensitive.
 """ ->
-function add_format{sym}(fmt::Type{DataFormat{sym}}, magic::@compat(Union{Tuple,AbstractVector,ByteString}), extension)
+function add_format{sym}(fmt::Type{DataFormat{sym}}, magic::@compat(Union{Tuple,AbstractVector,String}), extension)
     haskey(sym2info, sym) && error("format ", fmt, " is already registered")
     m = canonicalize_magic(magic)
     rng = searchsorted(magic_list, m, lt=magic_cmp)
@@ -155,11 +155,11 @@ Base.info{sym}(::Type{DataFormat{sym}}) = sym2info[sym]
 
 canonicalize_magic{N}(m::NTuple{N,UInt8}) = m
 canonicalize_magic(m::AbstractVector{UInt8}) = tuple(m...)
-canonicalize_magic(m::ByteString) = canonicalize_magic(m.data)
+canonicalize_magic(m::String) = canonicalize_magic(m.data)
 
 
 
-function add_extension(ext::ASCIIString, sym)
+function add_extension(ext::String, sym)
     if haskey(ext2sym, ext)
         v = ext2sym[ext]
         if isa(v, Symbol)
@@ -177,7 +177,7 @@ function add_extension(ext::@compat(Union{Array,Tuple}), sym)
     end
 end
 
-del_extension(ext::ASCIIString) = delete!(ext2sym, ext)
+del_extension(ext::String) = delete!(ext2sym, ext)
 function del_extension(ext::@compat(Union{Array,Tuple}))
     for e in ext
         del_extension(e)
@@ -213,7 +213,7 @@ abstract Formatted{F<:DataFormat}   # A specific file or stream
 DataFormat `fmt`.  For example, `File{fmtpng}(filename)` would indicate a PNG
 file.""" ->
 immutable File{F<:DataFormat} <: Formatted{F}
-    filename::UTF8String
+    filename::Compat.UTF8String
 end
 File{sym}(fmt::Type{DataFormat{sym}}, filename) = File{fmt}(filename)
 
@@ -236,10 +236,10 @@ indicate PNG format.  If known, the optional `filename` argument can
 be used to improve error messages, etc.""" ->
 immutable Stream{F<:DataFormat,IOtype<:IO} <: Formatted{F}
     io::IOtype
-    filename::Nullable{UTF8String}
+    filename::Nullable{Compat.UTF8String}
 end
 
-Stream{F<:DataFormat}(::Type{F}, io::IO) = Stream{F,typeof(io)}(io, Nullable{UTF8String}())
+Stream{F<:DataFormat}(::Type{F}, io::IO) = Stream{F,typeof(io)}(io, Nullable{Compat.UTF8String}())
 Stream{F<:DataFormat}(::Type{F}, io::IO, filename::AbstractString) = Stream{F,typeof(io)}(io,utf8(filename))
 Stream{F<:DataFormat}(::Type{F}, io::IO, filename) = Stream{F,typeof(io)}(io,filename)
 Stream{F}(file::File{F}, io::IO) = Stream{F,typeof(io)}(io,filename(file))
@@ -287,12 +287,15 @@ Base.eof(s::Stream) = eof(stream(s))
 Base.read!(s::Stream, array::Array) = read!(stream(s), array)
 @inline Base.write(s::Stream, args...) = write(stream(s), args...)
 # Note: we can't sensibly support the all keyword. If you need that,
-# call readbytes(stream(s), ...; all=value) manually
+# call read(stream(s), ...; all=value) manually
 Base.readbytes!(s::Stream, b) = readbytes!(stream(s), b)
 Base.readbytes!(s::Stream, b, nb) = readbytes!(stream(s), b, nb)
-Base.readbytes(s::Stream) = readbytes(stream(s))
-Base.readbytes(s::Stream, nb) = readbytes(stream(s), nb)
+Base.read(s::Stream) = read(stream(s))
+Base.read(s::Stream, nb) = read(stream(s), nb)
 Base.flush(s::Stream) = flush(stream(s))
+# 0.4 compat
+Base.readbytes(s::Stream) = read(stream(s))
+Base.readbytes(s::Stream, nb) = read(stream(s), nb)
 
 Base.isreadonly(s::Stream) = isreadonly(stream(s))
 Base.isopen(s::Stream) = isopen(stream(s))
@@ -321,7 +324,7 @@ function skipmagic(io, magic::Tuple)
     len = position(io)
     seekstart(io)
     filter!(x-> length(x) <= len, magic) # throw out magic bytes that are longer than IO
-    tmp = readbytes(io, length(first(magic))) # now, first is both the longest and guaranteed to fit into io, so we can just read the bytes
+    tmp = read(io, length(first(magic))) # now, first is both the longest and guaranteed to fit into io, so we can just read the bytes
     for m in magic
         if magic_equal(m, tmp)
             seek(io, length(m))
@@ -382,7 +385,7 @@ hasfunction(s::Tuple) = false #has magic
 format inferred from the magic bytes.""" ->
 query(io::IO, filename) = query(io, Nullable(utf8(filename)))
 
-function query(io::IO, filename::Nullable{UTF8String}=Nullable{UTF8String}())
+function query(io::IO, filename::Nullable{Compat.UTF8String}=Nullable{Compat.UTF8String}())
     magic = Array(UInt8, 0)
     pos = position(io)
     for p in magic_list

src/registry.jl

@@ -157,7 +157,7 @@ function detect_stlascii(io)
         len = position(io)
         seekstart(io)
         len < 80 && return false
-        header = readbytes(io, 80) # skip header
+        header = read(io, 80) # skip header
         seekstart(io)
         header[1:6] == b"solid " && !detect_stlbinary(io)
     finally

test/loadsave.jl

@@ -116,7 +116,7 @@ context("Save") do
         @fact position(s) --> 1
         @fact isreadonly(s) --> true
         @fact isopen(s) --> true
-        @fact readbytes(s, 2) --> b"UM"
+        @fact read(s, 2) --> b"UM"
     end
     rm(fn)
 
@@ -128,15 +128,16 @@ del_format(format"DUMMY")
 # PPM/PBM can be either binary or text. Test that the defaults work,
 # and that we can force a choice.
 module AmbigExt
+using Compat
 import FileIO: File, @format_str, Stream, stream, skipmagic
 
 load(f::File{format"AmbigExt1"}) = open(f) do io
     skipmagic(io)
-    readall(stream(io))
+    readstring(stream(io))
 end
 load(f::File{format"AmbigExt2"}) = open(f) do io
     skipmagic(io)
-    readall(stream(io))
+    readstring(stream(io))
 end
 
 save(f::File{format"AmbigExt1"}, testdata) = open(f, "w") do io