Merge pull request #145 from JuliaIO/yyc/0.7

Fix most of 0.7 depwarns

Author: yuyichao

REQUIRE

@@ -1,2 +1,2 @@
 julia 0.5
-Compat 0.17.0
+Compat 0.27.0

docs/make_docs.jl

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

src/query.jl

@@ -12,10 +12,10 @@ split_predicates(list) = filter(x-> x <: OS, list), filter(x-> !(x <: OS), list)
 applies_to_os(os::Vector) = isempty(os) || any(applies_to_os, os)
 applies_to_os{O <: OS}(os::Type{O})              = false
 
-applies_to_os{U <: Unix}(os::Type{U}) = is_unix()
-applies_to_os(os::Type{Windows}) = is_windows()
-applies_to_os(os::Type{OSX}) = is_apple()
-applies_to_os(os::Type{Linux}) = is_linux()
+applies_to_os{U <: Unix}(os::Type{U}) = Compat.Sys.isunix()
+applies_to_os(os::Type{Windows}) = Compat.Sys.iswindows()
+applies_to_os(os::Type{OSX}) = Compat.Sys.isapple()
+applies_to_os(os::Type{Linux}) = Compat.Sys.islinux()
 
 function add_loadsave(format, predicates)
     library = shift!(predicates)

test/loadsave.jl

@@ -1,6 +1,5 @@
 using FileIO
 using Base.Test
-using Compat
 
 # Stub readers---these might bork any existing readers, so don't
 # run these tests while doing other things!
@@ -60,7 +59,7 @@ add_format(format"DUMMY", b"DUMMY", ".dmy")
 
 module Dummy
 
-using FileIO, Compat
+using FileIO
 
 function FileIO.load(file::File{format"DUMMY"})
     open(file) do s
@@ -166,7 +165,6 @@ 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

test/query.jl

@@ -1,22 +1,21 @@
 using FileIO
 using Base.Test
 using Compat
-using Compat.String
 
 @testset "OS" begin
-    if is_linux()
+    if Compat.Sys.islinux()
         @test FileIO.applies_to_os(FileIO.Linux)
         @test !(FileIO.applies_to_os(FileIO.OSX))
         @test FileIO.applies_to_os(FileIO.Unix)
         @test !(FileIO.applies_to_os(FileIO.Windows))
     end
-    if is_apple()
+    if Compat.Sys.isapple()
         @test !(FileIO.applies_to_os(FileIO.Linux))
         @test FileIO.applies_to_os(FileIO.OSX)
         @test FileIO.applies_to_os(FileIO.Unix)
         @test !(FileIO.applies_to_os(FileIO.Windows))
     end
-    if is_windows()
+    if Compat.Sys.iswindows()
         @test !(FileIO.applies_to_os(FileIO.Linux))
         @test !(FileIO.applies_to_os(FileIO.OSX))
         @test !(FileIO.applies_to_os(FileIO.Unix))
@@ -231,7 +230,7 @@ try
     @testset "multiple libs" begin
         lensave0 = length(FileIO.sym2saver)
         lenload0 = length(FileIO.sym2loader)
-        OSKey = is_apple() ? FileIO.OSX : is_windows() ? FileIO.Windows : is_linux() ? FileIO.Linux : error("os not supported")
+        OSKey = Compat.Sys.isapple() ? FileIO.OSX : Compat.Sys.iswindows() ? FileIO.Windows : Compat.Sys.islinux() ? FileIO.Linux : error("os not supported")
         add_format(
             format"MultiLib",
             UInt8[0x42,0x4d],