Skip to content

Commit 765ec49

Browse files
committed
Ensure depwarn removals don't break julia-0.4
1 parent 16f0ac4 commit 765ec49

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
julia 0.3
2-
Compat 0.7.15
2+
Compat 0.7.19
33
# The rest are needed only on julia 0.3
44
Docile

src/query.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ immutable Stream{F<:DataFormat,IOtype<:IO} <: Formatted{F}
241241
end
242242

243243
Stream{F<:DataFormat}(::Type{F}, io::IO) = Stream{F,typeof(io)}(io, Nullable{Compat.UTF8String}())
244-
Stream{F<:DataFormat}(::Type{F}, io::IO, filename::AbstractString) = Stream{F,typeof(io)}(io,Compat.String(filename))
244+
Stream{F<:DataFormat}(::Type{F}, io::IO, filename::AbstractString) = Stream{F,typeof(io)}(io,Compat.UTF8String(filename))
245245
Stream{F<:DataFormat}(::Type{F}, io::IO, filename) = Stream{F,typeof(io)}(io,filename)
246246
Stream{F}(file::File{F}, io::IO) = Stream{F,typeof(io)}(io,filename(file))
247247

@@ -384,7 +384,7 @@ hasfunction(s::Tuple) = false #has magic
384384
@doc """
385385
`query(io, [filename])` returns a `Stream` object with information about the
386386
format inferred from the magic bytes.""" ->
387-
query(io::IO, filename) = query(io, Nullable(Compat.String(filename)))
387+
query(io::IO, filename) = query(io, Nullable(Compat.UTF8String(filename)))
388388

389389
function query(io::IO, filename::Nullable{Compat.UTF8String}=Nullable{Compat.UTF8String}())
390390
magic = Array(UInt8, 0)

test/query.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using FileIO
22
using FactCheck
3+
using Compat
34

45
if VERSION < v"0.4.0-dev"
5-
using Compat
66
import FileIO.Pair
77
end
88

0 commit comments

Comments
 (0)