Fix tests and deprecations on Julia 0.6

Also drop pre-0.5 compatibility code.

Author: nalimilan

REQUIRE

@@ -1,5 +1,5 @@
 julia 0.5
 BinDeps
-Compat 0.9.5
+Compat 0.17.0
 @windows WinRPM
 LegacyStrings 0.1.1

deps/build.jl

@@ -34,7 +34,7 @@ end
 libiconv = library_dependency("libiconv", aliases = ["libc", "iconv"],
                               validate = validate_iconv)
 
-@windows_only begin
+if is_windows()
     using WinRPM
     provides(WinRPM.RPM, "win_iconv-dll", libiconv, os = :Windows)
 end

src/StringEncodings.jl

@@ -2,7 +2,7 @@
 
 module StringEncodings
 using Base.Libc: errno, strerror, E2BIG, EINVAL, EILSEQ
-using Compat: String, ASCIIString, UTF8String, view
+using Compat: @compat
 
 import Base: close, eachline, eof, flush, isreadable, iswritable,
              open, readline, readlines, readuntil, show, write
@@ -16,24 +16,24 @@ include("encodings.jl")
 using StringEncodings.Encodings
 export encoding, encodings_list, Encoding, @enc_str
 
-abstract StringEncodingError
+@compat abstract type StringEncodingError end
 
 # Specified encodings or the combination are not supported by iconv
 type InvalidEncodingError <: StringEncodingError
-    args::Tuple{ASCIIString, ASCIIString}
+    args::Tuple{String, String}
 end
 InvalidEncodingError(from, to) = InvalidEncodingError((from, to))
 message(::Type{InvalidEncodingError}) = "Conversion from <<1>> to <<2>> not supported by iconv implementation, check that specified encodings are correct"
 
 # Encountered invalid byte sequence
 type InvalidSequenceError <: StringEncodingError
-    args::Tuple{ASCIIString}
+    args::Tuple{String}
 end
 InvalidSequenceError(seq::Vector{UInt8}) = InvalidSequenceError((bytes2hex(seq),))
 message(::Type{InvalidSequenceError}) = "Byte sequence 0x<<1>> is invalid in source encoding or cannot be represented in target encoding"
 
 type IConvError <: StringEncodingError
-    args::Tuple{ASCIIString, Int, ASCIIString}
+    args::Tuple{String, Int, String}
 end
 IConvError(func::String) = IConvError((func, errno(), strerror(errno())))
 message(::Type{IConvError}) = "<<1>>: <<2>> (<<3>>)"
@@ -434,16 +434,30 @@ Methods to read text in character encoding `enc`.
 readuntil(s::IO, enc::Encoding, delim) = readuntil(StringDecoder(s, enc), delim)
 readuntil(filename::AbstractString, enc::Encoding, delim) = open(io->readuntil(io, enc, delim), filename)
 
-"""
-    eachline(stream::IO, enc::Encoding)
-    eachline(filename::AbstractString, enc::Encoding)
-
-Methods to read text in character encoding `enc`. Decoding is performed on the fly.
-"""
-eachline(s::IO, enc::Encoding) = eachline(StringDecoder(s, enc))
-function eachline(filename::AbstractString, enc::Encoding)
-    s = open(filename, enc)
-    EachLine(s, ()->close(s))
+if VERSION >= v"0.6.0-dev.2467"
+    """
+        eachline(stream::IO, enc::Encoding; chomp=true)
+        eachline(filename::AbstractString, enc::Encoding; chomp=true)
+
+    Methods to read text in character encoding `enc`. Decoding is performed on the fly.
+    """
+    eachline(s::IO, enc::Encoding; chomp=true) = eachline(StringDecoder(s, enc); chomp=true)
+    function eachline(filename::AbstractString, enc::Encoding; chomp=true)
+        s = open(filename, enc)
+            EachLine(s, ondone=()->close(s), chomp=chomp)
+    end
+else
+    """
+        eachline(stream::IO, enc::Encoding)
+        eachline(filename::AbstractString, enc::Encoding)
+
+    Methods to read text in character encoding `enc`. Decoding is performed on the fly.
+    """
+    eachline(s::IO, enc::Encoding) = eachline(StringDecoder(s, enc))
+    function eachline(filename::AbstractString, enc::Encoding)
+        s = open(filename, enc)
+            EachLine(s, ()->close(s))
+    end
 end
 
 
@@ -471,8 +485,8 @@ end
 
 decode{T<:AbstractString}(::Type{T}, a::Vector{UInt8}, enc::AbstractString) = decode(T, a, Encoding(enc))
 
-decode(a::Vector{UInt8}, enc::AbstractString) = decode(UTF8String, a, Encoding(enc))
-decode(a::Vector{UInt8}, enc::Union{AbstractString, Encoding}) = decode(UTF8String, a, enc)
+decode(a::Vector{UInt8}, enc::AbstractString) = decode(String, a, Encoding(enc))
+decode(a::Vector{UInt8}, enc::Union{AbstractString, Encoding}) = decode(String, a, enc)
 
 """
     encode(s::AbstractString, enc)

src/encodings.jl

@@ -4,13 +4,10 @@
 
 module Encodings
 
-using Compat
 import Base: show, print, convert
 export encoding, encodings_list, Encoding, @enc_str
 
-if VERSION >= v"0.5.0-"
-    using LegacyStrings: ASCIIString, UTF8String, UTF16String, UTF32String
-end
+using LegacyStrings: ASCIIString, UTF8String, UTF16String, UTF32String
 
 immutable Encoding{enc} end
 
@@ -26,10 +23,7 @@ print{enc}(io::IO, ::Encoding{enc}) = print(io, enc)
 
 
 ## Get the encoding used by a string type
-if VERSION >= v"0.5.0-"
-    encoding(::Type{String})  = enc"UTF-8"
-end
-
+encoding(::Type{String})  = enc"UTF-8"
 encoding(::Type{ASCIIString}) = enc"ASCII"
 encoding(::Type{UTF8String})  = enc"UTF-8"
 

test/runtests.jl

@@ -158,15 +158,24 @@ mktemp() do path, io
     @test readuntil(path, enc"ISO-2022-JP", "チャ") == "a string \0チャ"
     @test open(io->readuntil(io, enc"ISO-2022-JP", "チャ"), path) == "a string \0チャ"
 
-    @test readline(path, enc"ISO-2022-JP") == string(split(s, '\n')[1], '\n')
-    @test open(readline, path, enc"ISO-2022-JP") == string(split(s, '\n')[1], '\n')
+    if VERSION >= v"0.6.0-dev.2467"
+        @test readline(path, enc"ISO-2022-JP") == split(s, '\n')[1]
+        @test open(readline, path, enc"ISO-2022-JP") == split(s, '\n')[1]
+    else
+        @test readline(path, enc"ISO-2022-JP") == string(split(s, '\n')[1], '\n')
+        @test open(readline, path, enc"ISO-2022-JP") == string(split(s, '\n')[1], '\n')
+    end
     a = readlines(path, enc"ISO-2022-JP")
     b = open(readlines, path, enc"ISO-2022-JP")
 
     c = collect(eachline(path, enc"ISO-2022-JP"))
     d = open(io->collect(eachline(io, enc"ISO-2022-JP")), path)
 
-    @test a[1] == b[1] == c[1] == d[1] == string(split(s, '\n')[1], '\n')
+    if VERSION >= v"0.6.0-dev.2467"
+        @test a[1] == b[1] == c[1] == d[1] == split(s, '\n')[1]
+    else
+        @test a[1] == b[1] == c[1] == d[1] == string(split(s, '\n')[1], '\n')
+    end
     @test a[2] == b[2] == c[2] == d[2] == split(s, '\n')[2]
 
     # Test alternative syntaxes for open()