remove compat, fix read! call (#44)

* Remove Compat

* correct Base method name

Closes #43

Author: RalphAS

.travis.yml

@@ -3,7 +3,7 @@ os:
     - linux
     - osx
 julia:
-    - 0.6
+    - 0.7
     - 1.0
     - nightly
 notifications:

REQUIRE

@@ -1,2 +1 @@
-julia 0.6
-Compat 0.59.0
+julia 0.7

src/ZipFile.jl

@@ -1,5 +1,3 @@
-VERSION < v"0.7.0-beta2.199" && __precompile__()
-
 """
 A Julia package for reading/writing ZIP archive files
 
@@ -38,8 +36,7 @@ Julia
 module ZipFile
 
 import Base: read, eof, write, close, mtime, position, show, unsafe_write
-using Compat
-using Compat.Printf
+using Printf
 
 export read, eof, write, close, mtime, position, show
 
@@ -108,7 +105,7 @@ mutable struct Reader
         diroff, nfiles, comment = _find_diroffset(io, endoff)
         files = _getfiles(io, diroff, nfiles)
         x = new(io, close_io, files, comment)
-        @compat finalizer(close, x)
+        finalizer(close, x)
         x
     end
 end
@@ -145,7 +142,7 @@ mutable struct WritableFile <: IO
         end
         f = new(io, name, method, dostime, dosdate, crc32,
             compressedsize, uncompressedsize, _offset, _datapos, _zio, _closed)
-        @compat finalizer(close, f)
+        finalizer(close, f)
         f
     end
 end
@@ -167,7 +164,7 @@ mutable struct Writer
 
     function Writer(io::IO, close_io::Bool)
         x = new(io, close_io, WritableFile[], nothing, false)
-        @compat finalizer(close, x)
+        finalizer(close, x)
         x
     end
 end
@@ -276,7 +273,7 @@ function _find_enddiroffset(io::IO)
         k = min(filesize, guess)
         n = filesize-k
         seek(io, n)
-        b = read!(io, Array{UInt8}(Compat.undef, k))
+        b = read!(io, Array{UInt8}(undef, k))
         for i in 1:k-3
             if getindex_u32le(b, i) == _EndCentralDirSig
                 offset = n+i-1
@@ -300,13 +297,13 @@ function _find_diroffset(io::IO, enddiroffset::Integer)
     skip(io, 4)
     offset = readle(io, UInt32)
     commentlen = readle(io, UInt16)
-    comment = utf8_validate(read!(io, Array{UInt8}(Compat.undef, commentlen)))
+    comment = utf8_validate(read!(io, Array{UInt8}(undef, commentlen)))
     offset, nfiles, comment
 end
 
 function _getfiles(io::IO, diroffset::Integer, nfiles::Integer)
     seek(io, diroffset)
-    files = Vector{ReadableFile}(Compat.undef, nfiles)
+    files = Vector{ReadableFile}(undef, nfiles)
     for i in 1:nfiles
         if readle(io, UInt32) != _CentralDirSig
             error("invalid file header")
@@ -327,7 +324,7 @@ function _getfiles(io::IO, diroffset::Integer, nfiles::Integer)
         commentlen = readle(io, UInt16)
         skip(io, 2+2+4)
         offset = readle(io, UInt32)
-        name = utf8_validate(read!(io, Array{UInt8}(Compat.undef, namelen)))
+        name = utf8_validate(read!(io, Array{UInt8}(undef, namelen)))
         skip(io, extralen+commentlen)
         files[i] = ReadableFile(io, name, method, dostime, dosdate,
             crc32, compsize, uncompsize, offset)
@@ -371,7 +368,7 @@ function close(w::Writer)
         _writele(w._io, UInt32(f.crc32))
         _writele(w._io, UInt32(f.compressedsize))
         _writele(w._io, UInt32(f.uncompressedsize))
-        b = Vector{UInt8}(Compat.codeunits(f.name))
+        b = Vector{UInt8}(codeunits(f.name))
         _writele(w._io, UInt16(length(b)))
         _writele(w._io, UInt16(0))
         _writele(w._io, UInt16(0))
@@ -426,7 +423,9 @@ end
 # Read data into a. Throws EOFError if a cannot be filled in completely.
 function read(f::ReadableFile, a::Array{T}) where T
     if !isbitstype(T)
-        return invoke(read, Tuple{IO,Array}, f, a)
+        # may need to wrap in invoke() if this package is refactored to overload read!
+        # return invoke(read!, Tuple{IO,Array}, f, a)
+        return read!(f, a)
     end
 
     if f._datapos < 0
@@ -451,7 +450,7 @@ function read(f::ReadableFile, a::Array{T}) where T
     end
 
     seek(f._io, f._datapos+f._zpos)
-    b = Array{UInt8}(Compat.undef, sizeof(a))
+    b = Array{UInt8}(undef, sizeof(a))
     read!(f._zio, b)
     f._zpos = position(f._io) - f._datapos
     f._pos += length(b)
@@ -510,7 +509,7 @@ function addfile(w::Writer, name::AbstractString; method::Integer=Store, mtime::
     _writele(w._io, UInt32(f.crc32))    # filler
     _writele(w._io, UInt32(f.compressedsize))   # filler
     _writele(w._io, UInt32(f.uncompressedsize)) # filler
-    b = Vector{UInt8}(Compat.codeunits(f.name))
+    b = Vector{UInt8}(codeunits(f.name))
     _writele(w._io, UInt16(length(b)))
     _writele(w._io, UInt16(0))
     _writele(w._io, b)

src/Zlib.jl

@@ -1,7 +1,7 @@
 # This file was copied from https://github.com/dcjones/Zlib.jl
 #
 # Zlib is licensed under the MIT License:
-# 
+#
 # > Copyright (c) 2013: Daniel C. Jones
 # >
 # > Permission is hereby granted, free of charge, to any person obtaining
@@ -25,8 +25,6 @@
 
 module Zlib
 
-using Compat
-
 import Base: read, read!, readuntil, readbytes!, write, close, eof
 
 export compress, decompress, crc32
@@ -49,7 +47,7 @@ const Z_MEM_ERROR     = -4
 const Z_BUF_ERROR     = -5
 const Z_VERSION_ERROR = -6
 
-if Compat.Sys.iswindows()
+if Sys.iswindows()
     const libz = "zlib1"
 else
     const libz = "libz"
@@ -66,11 +64,11 @@ mutable struct z_stream
     total_out::Culong
 
     msg::Ptr{UInt8}
-    state::Ptr{Compat.Cvoid}
+    state::Ptr{Cvoid}
 
-    zalloc::Ptr{Compat.Cvoid}
-    zfree::Ptr{Compat.Cvoid}
-    opaque::Ptr{Compat.Cvoid}
+    zalloc::Ptr{Cvoid}
+    zfree::Ptr{Cvoid}
+    opaque::Ptr{Cvoid}
 
     data_type::Cint
     adler::Culong
@@ -106,7 +104,7 @@ mutable struct Writer <: IO
     closed::Bool
 
     Writer(strm::z_stream, io::IO, closed::Bool) =
-        (w = new(strm, io, closed); @compat(finalizer(close, w)); w)
+        (w = new(strm, io, closed); finalizer(close, w); w)
 end
 
 function Writer(io::IO, level::Integer, raw::Bool=false)
@@ -131,7 +129,7 @@ Writer(io::IO, raw::Bool=false) = Writer(io, 9, raw)
 function write(w::Writer, p::Ptr, nb::Integer)
     w.strm.next_in = p
     w.strm.avail_in = nb
-    outbuf = Vector{UInt8}(Compat.undef, 1024)
+    outbuf = Vector{UInt8}(undef, 1024)
 
     while true
         w.strm.avail_out = length(outbuf)
@@ -203,10 +201,10 @@ function close(w::Writer)
     w.closed = true
 
     # flush zlib buffer using Z_FINISH
-    inbuf = Vector{UInt8}(Compat.undef, 0)
+    inbuf = Vector{UInt8}(undef, 0)
     w.strm.next_in = pointer(inbuf)
     w.strm.avail_in = 0
-    outbuf = Vector{UInt8}(Compat.undef, 1024)
+    outbuf = Vector{UInt8}(undef, 1024)
     ret = Z_OK
     while ret != Z_STREAM_END
         w.strm.avail_out = length(outbuf)
@@ -239,7 +237,7 @@ mutable struct Reader <: IO
     stream_end::Bool
 
     Reader(strm::z_stream, io::IO, buf::IOBuffer, closed::Bool, bufsize::Int) =
-        (r = new(strm, io, buf, closed, bufsize, false); @compat(finalizer(close, r)); r)
+        (r = new(strm, io, buf, closed, bufsize, false); finalizer(close, r); r)
 end
 
 function Reader(io::IO, raw::Bool=false; bufsize::Int=4096)
@@ -258,11 +256,11 @@ end
 # unless we have already reached EOF.
 function fillbuf(r::Reader, minlen::Integer)
     ret = Z_OK
-    while Compat.bytesavailable(r.buf) < minlen && !eof(r.io) && ret != Z_STREAM_END
-        input = read!(r.io, Array{UInt8}(Compat.undef, min(Compat.bytesavailable(r.io), r.bufsize)))
+    while bytesavailable(r.buf) < minlen && !eof(r.io) && ret != Z_STREAM_END
+        input = read!(r.io, Array{UInt8}(undef, min(bytesavailable(r.io), r.bufsize)))
         r.strm.next_in = pointer(input)
         r.strm.avail_in = length(input)
-        #outbuf = Vector{UInt8}(Compat.undef, r.bufsize)
+        #outbuf = Vector{UInt8}(undef, r.bufsize)
 
         while true
             #r.strm.next_out = outbuf
@@ -293,7 +291,7 @@ function fillbuf(r::Reader, minlen::Integer)
         r.stream_end = true
     end
 
-    Compat.bytesavailable(r.buf)
+    bytesavailable(r.buf)
 end
 
 # This is to fix the ambiguity with Base.read!
@@ -321,7 +319,7 @@ end
 
 # This function needs to be fast because other read calls use it.
 function read(r::Reader, ::Type{UInt8})
-    if Compat.bytesavailable(r.buf) < 1 && fillbuf(r, 1) < 1
+    if bytesavailable(r.buf) < 1 && fillbuf(r, 1) < 1
         throw(EOFError())
     end
     read(r.buf, UInt8)
@@ -335,17 +333,17 @@ readbytes!(r::Reader, b::AbstractArray{UInt8}, nb=length(b)) =
 function readuntil(r::Reader, delim::UInt8)
     nb = readuntil(r.buf, delim)
     while nb == 0
-        offset = Compat.bytesavailable(r.buf)
+        offset = bytesavailable(r.buf)
         fillbuf(r, offset+r.bufsize)
-        if Compat.bytesavailable(r.buf) == nb
+        if bytesavailable(r.buf) == nb
             break
         end
         # TODO: add offset here when https://github.com/JuliaLang/julia/pull/4485
         # is merged
         nb = readuntil(r.buf, delim) #, offset)
     end
-    if nb == 0;  nb == Compat.bytesavailable(r.buf); end
-    read!(r.buf, Vector{UInt8}(Compat.undef, nb))
+    if nb == 0;  nb == bytesavailable(r.buf); end
+    read!(r.buf, Vector{UInt8}(undef, nb))
 end
 
 function close(r::Reader)
@@ -366,7 +364,7 @@ function eof(r::Reader)
     # yield no uncompressed data. So, make sure we can get at least
     # one more byte of decompressed data before we say we haven't
     # reached EOF yet.
-    Compat.bytesavailable(r.buf) == 0 && eof(r.io)
+    bytesavailable(r.buf) == 0 && eof(r.io)
 end
 
 function crc32(data::Vector{UInt8}, crc::Integer=0)

src/iojunk.jl

@@ -7,7 +7,7 @@ end
 function read(f::ReadableFile, ::Type{UInt8})
     # This function needs to be fast because readbytes, readstring, etc.
     # uses it. Avoid function calls when possible.
-    b = Vector{UInt8}(Compat.undef, 1)
+    b = Vector{UInt8}(undef, 1)
     c = read(f, b)
     c[1]
 end

test/runtests.jl

@@ -1,5 +1,4 @@
-using Compat
-using Compat.Test
+using Test
 using ZipFile
 
 Debug = false
@@ -93,8 +92,8 @@ write(f, s1)
 write(f, s2)
 close(dir)
 dir = ZipFile.Reader(filename)
-@test String(read!(dir.files[1], Array{UInt8}(Compat.undef, length(s1)))) == s1
-@test String(read!(dir.files[1], Array{UInt8}(Compat.undef, length(s2)))) == s2
+@test String(read!(dir.files[1], Array{UInt8}(undef, length(s1)))) == s1
+@test String(read!(dir.files[1], Array{UInt8}(undef, length(s2)))) == s2
 @test eof(dir.files[1])
 close(dir)
 
@@ -111,7 +110,7 @@ data = Any[
 filename = "$tmp/multi2.zip"
 dir = ZipFile.Writer(filename)
 f = ZipFile.addfile(dir, "data"; method=ZipFile.Deflate)
-@test_throws ErrorException read!(f, Array{UInt8}(Compat.undef, 1))
+@test_throws ErrorException read!(f, Array{UInt8}(undef, 1))
 for x in data
     write(f, x)
 end
@@ -121,7 +120,7 @@ dir = ZipFile.Reader(filename)
 @test_throws ErrorException write(dir.files[1], UInt8(20))
 for x in data
     if isa(x, String)
-        @test x == String(read!(dir.files[1], Array{UInt8}(Compat.undef, length(x))))
+        @test x == String(read!(dir.files[1], Array{UInt8}(undef, length(x))))
     elseif isa(x, Array)
         y = similar(x)
         y[:] .= 0