Merge pull request #33 from JuliaIO/sd/depwarns

removed depwarns

Author: SimonDanisch

src/FileIO.jl

@@ -1,9 +1,10 @@
 VERSION >= v"0.4.0-dev+6641" && __precompile__()
 
 module FileIO
+using Compat
 
 if VERSION < v"0.4.0-dev"
-    using Docile, Compat
+    using Docile
     immutable Pair{A,B}
         first::A
         second::B
@@ -46,7 +47,7 @@ the magic bytes are essential.
 - `load(File(format"PNG",filename))` specifies the format directly, and bypasses inference.
 - `load(f; options...)` passes keyword arguments on to the loader.
 """ ->
-function load(s::Union(AbstractString,IO), args...; options...)
+function load(s::@compat(Union{AbstractString,IO}), args...; options...)
     q = query(s)
     check_loader(q)
     load(q, args...; options...)
@@ -58,7 +59,7 @@ trying to infer the format from `filename`.
 - `save(Stream(format"PNG",io), data...)` specifies the format directly, and bypasses inference.
 - `save(f, data...; options...)` passes keyword arguments on to the saver.
 """ ->
-function save(s::Union(AbstractString,IO), data...; options...)
+function save(s::@compat(Union{AbstractString,IO}), data...; options...)
     q = query(s)
     check_saver(q)
     save(q, data...; options...)

src/query.jl

@@ -20,7 +20,7 @@ const unknown_df = DataFormat{:UNKNOWN}
 unknown(::Type{format"UNKNOWN"}) = true
 unknown{sym}(::Type{DataFormat{sym}}) = false
 
-const ext2sym = Dict{ASCIIString,Union(Symbol,Vector{Symbol})}()
+const ext2sym = Dict{ASCIIString, @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
@@ -35,7 +35,7 @@ For example:
 
 Note that extensions, magic numbers, and format-identifiers are case-sensitive.
 """ ->
-function add_format{sym}(fmt::Type{DataFormat{sym}}, magic::Union(Tuple,AbstractVector,ByteString), extension)
+function add_format{sym}(fmt::Type{DataFormat{sym}}, magic::@compat(Union{Tuple,AbstractVector,ByteString}), extension)
     haskey(sym2info, sym) && error("format ", fmt, " is already registered")
     m = canonicalize_magic(magic)
     rng = searchsorted(magic_list, m, lt=magic_cmp)
@@ -49,7 +49,7 @@ function add_format{sym}(fmt::Type{DataFormat{sym}}, magic::Union(Tuple,Abstract
 end
 
 # for multiple magic bytes
-function add_format{sym, T <: Vector{Uint8}, N}(fmt::Type{DataFormat{sym}}, magics::NTuple{N, T}, extension)
+function add_format{sym, T <: Vector{UInt8}, N}(fmt::Type{DataFormat{sym}}, magics::NTuple{N, T}, extension)
     haskey(sym2info, sym) && error("format ", fmt, " is already registered")
     magics = map(canonicalize_magic, magics)
     for magic in magics
@@ -90,7 +90,7 @@ del_magic(magic::Tuple, sym) = for m in magic
     del_magic(m, sym)
 end
 # Deletes single magic bytes
-function del_magic{N}(magic::NTuple{N, Uint8}, sym)
+function del_magic{N}(magic::NTuple{N, UInt8}, sym)
     rng = searchsorted(magic_list, magic, lt=magic_cmp)
     if length(magic) == 0
         fullrng = rng
@@ -133,14 +133,14 @@ function add_extension(ext::ASCIIString, sym)
     end
     ext2sym[ext] = sym
 end
-function add_extension(ext::Union(Array,Tuple), sym)
+function add_extension(ext::@compat(Union{Array,Tuple}), sym)
     for e in ext
         add_extension(e, sym)
     end
 end
 
 del_extension(ext::ASCIIString) = delete!(ext2sym, ext)
-function del_extension(ext::Union(Array,Tuple))
+function del_extension(ext::@compat(Union{Array,Tuple}))
     for e in ext
         del_extension(e)
     end

src/registry.jl

@@ -89,6 +89,16 @@ add_format(format"WPG", UInt8[0xff,0x57,0x50,0x43], ".wpg")
 add_loader(format"WPG", :ImageMagick)
 add_saver(format"WPG", :ImageMagick)
 
+#=
+add_format(format"NPY", UInt8[0x93, 'N', 'U', 'M', 'P', 'Y'], ".npy")
+add_loader(format"NPZ", :NPZ)
+add_saver(format"NPZ", :NPZ)
+
+add_format(format"ZIP", [0x50,0x4b,0x03,0x04], ".zip")
+add_loader(format"ZIP", :ZipeFile)
+add_saver(format"ZIP", :ZipeFile)
+=#
+
 #Shader files
 add_format(format"GLSLShader", (), [".frag", ".vert", ".geom", ".comp"])
 add_loader(format"GLSLShader", :GLAbstraction)
@@ -117,7 +127,6 @@ add_saver(format"OFF", :MeshIO)
 
 
 
-
 ### Complex cases
 # HDF5: the complication is that the magic bytes may start at
 # 0, 512, 1024, 2048, or any multiple of 2 thereafter
@@ -161,8 +170,8 @@ function detect_stlascii(io)
     end
 end
 function detect_stlbinary(io)
-    const size_header = 80+sizeof(Uint32)
-    const size_triangleblock = (4*3*sizeof(Float32)) + sizeof(Uint16)
+    const size_header = 80+sizeof(UInt32)
+    const size_triangleblock = (4*3*sizeof(Float32)) + sizeof(UInt16)
 
     position(io) != 0 && (seekstart(io); return false)
     seekend(io)
@@ -171,12 +180,12 @@ function detect_stlbinary(io)
     len < size_header && return false
 
     skip(io, 80) # skip header
-    number_of_triangle_blocks = read(io, Uint32)
+    number_of_triangle_blocks = read(io, UInt32)
      #1 normal, 3 vertices in Float32 + attrib count, usually 0
     len != (number_of_triangle_blocks*size_triangleblock)+size_header && (seekstart(io); return false)
-    skip(io, number_of_triangle_blocks*size_triangleblock-sizeof(Uint16))
-    attrib_byte_count = read(io, Uint16) # read last attrib_byte
-    attrib_byte_count != zero(Uint16) && (seekstart(io); return false) # should be zero as not used
+    skip(io, number_of_triangle_blocks*size_triangleblock-sizeof(UInt16))
+    attrib_byte_count = read(io, UInt16) # read last attrib_byte
+    attrib_byte_count != zero(UInt16) && (seekstart(io); return false) # should be zero as not used
     result = eof(io) # if end of file, we have a stl!
     seekstart(io)
     return result