Skip to content

Commit 7bbef28

Browse files
authored
fix errors and warnings on Julia 0.7 (#10)
1 parent a0ca6a1 commit 7bbef28

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/decompression.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function GzipDecompressor(;windowbits::Integer=Z_DEFAULT_WINDOWBITS, gziponly::B
3232
if !(8 windowbits 15)
3333
throw(ArgumentError("windowbits must be within 8..15"))
3434
end
35-
return GzipDecompressor(ZStream(), windowbits+(gziponly?16:32))
35+
return GzipDecompressor(ZStream(), windowbits+(gziponly ? 16 : 32))
3636
end
3737

3838
const GzipDecompressorStream{S} = TranscodingStream{GzipDecompressor,S} where S<:IO

src/libz.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const Z_DEFAULT_STRATEGY = Cint(0)
5555
const Z_DEFAULT_MEMLEVEL = Cint(8)
5656
const Z_DEFAULT_WINDOWBITS = Cint(15)
5757

58-
if is_windows()
58+
if isdefined(Sys, :iswindows) ? Sys.iswindows() : is_windows()
5959
const libz = "zlib1"
6060
else
6161
const libz = "libz"

test/runtests.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ const testdir = @__DIR__
1616
@testset "Gzip Codec" begin
1717
codec = GzipCompressor()
1818
@test codec isa GzipCompressor
19-
@test ismatch(r"^CodecZlib.GzipCompressor\(level=-1, windowbits=\d+\)$", sprint(show, codec))
19+
@test ismatch(r"^(CodecZlib\.)?GzipCompressor\(level=-1, windowbits=\d+\)$", sprint(show, codec))
2020
@test CodecZlib.initialize(codec) === nothing
2121
@test CodecZlib.finalize(codec) === nothing
2222

2323
codec = GzipDecompressor()
2424
@test codec isa GzipDecompressor
25-
@test ismatch(r"^CodecZlib.GzipDecompressor\(windowbits=\d+\)$", sprint(show, codec))
25+
@test ismatch(r"^(CodecZlib\.)?GzipDecompressor\(windowbits=\d+\)$", sprint(show, codec))
2626
@test CodecZlib.initialize(codec) === nothing
2727
@test CodecZlib.finalize(codec) === nothing
2828

@@ -118,13 +118,13 @@ end
118118
@testset "Zlib Codec" begin
119119
codec = ZlibCompressor()
120120
@test codec isa ZlibCompressor
121-
@test ismatch(r"^CodecZlib\.ZlibCompressor\(level=-1, windowbits=\d+\)$", sprint(show, codec))
121+
@test ismatch(r"^(CodecZlib\.)?ZlibCompressor\(level=-1, windowbits=\d+\)$", sprint(show, codec))
122122
@test CodecZlib.initialize(codec) === nothing
123123
@test CodecZlib.finalize(codec) === nothing
124124

125125
codec = ZlibDecompressor()
126126
@test codec isa ZlibDecompressor
127-
@test ismatch(r"^CodecZlib\.ZlibDecompressor\(windowbits=\d+\)$", sprint(show, codec))
127+
@test ismatch(r"^(CodecZlib\.)?ZlibDecompressor\(windowbits=\d+\)$", sprint(show, codec))
128128
@test CodecZlib.initialize(codec) === nothing
129129
@test CodecZlib.finalize(codec) === nothing
130130

@@ -198,14 +198,14 @@ end
198198
@testset "Deflate Codec" begin
199199
codec = DeflateCompressor()
200200
@test codec isa DeflateCompressor
201-
@test ismatch(r"^CodecZlib\.DeflateCompressor\(level=-1, windowbits=-\d+\)$", sprint(show, codec))
201+
@test ismatch(r"^(CodecZlib\.)?DeflateCompressor\(level=-1, windowbits=-\d+\)$", sprint(show, codec))
202202
@test CodecZlib.initialize(codec) === nothing
203203
# FIXME: This test fails.
204204
#@test CodecZlib.finalize(codec) === nothing
205205

206206
codec = DeflateDecompressor()
207207
@test codec isa DeflateDecompressor
208-
@test ismatch(r"^CodecZlib\.DeflateDecompressor\(windowbits=-\d+\)$", sprint(show, codec))
208+
@test ismatch(r"^(CodecZlib\.)?DeflateDecompressor\(windowbits=-\d+\)$", sprint(show, codec))
209209
@test CodecZlib.initialize(codec) === nothing
210210
@test CodecZlib.finalize(codec) === nothing
211211

0 commit comments

Comments
 (0)