Fix 0.5 deprecations using LegacyEncodings

The package isn't strictly needed, but we need to depend on it
just to provide encodings() methods for legacy string types on 0.5,
which can always be useful to people working with encodings (until
encoded strings are supported directly by the package).

Author: nalimilan

REQUIRE

@@ -1,4 +1,5 @@
 julia 0.4
 BinDeps
-Compat
+Compat 0.8.0
 @windows WinRPM
+LegacyStrings 0.1.1

src/StringEncodings.jl

@@ -1,16 +1,20 @@
 # This file is a part of StringEncodings.jl. License is MIT: http://julialang.org/license
 
 module StringEncodings
+using Base.Libc: errno, strerror, E2BIG, EINVAL, EILSEQ
+using Compat: String, ASCIIString, UTF8String, view
+
 import Base: close, eachline, eof, flush, isreadable, iswritable,
-             open, read, readline, readlines, readuntil, show, write
-import Base.Libc: errno, strerror, E2BIG, EINVAL, EILSEQ
+             open, readline, readlines, readuntil, show, write
 import Compat: read
 
 export StringEncoder, StringDecoder, encode, decode, encodings
 export StringEncodingError, OutputBufferError, IConvError
 export InvalidEncodingError, InvalidSequenceError, IncompleteSequenceError
 
 include("encodings.jl")
+using StringEncodings.Encodings
+export encoding, encodings_list, Encoding, @enc_str
 
 abstract StringEncodingError
 
@@ -31,7 +35,7 @@ message(::Type{InvalidSequenceError}) = "Byte sequence 0x<<1>> is invalid in sou
 type IConvError <: StringEncodingError
     args::Tuple{ASCIIString, Int, ASCIIString}
 end
-IConvError(func::ASCIIString) = IConvError((func, errno(), strerror(errno())))
+IConvError(func::String) = IConvError((func, errno(), strerror(errno())))
 message(::Type{IConvError}) = "<<1>>: <<2>> (<<3>>)"
 
 # Input ended with incomplete byte sequence
@@ -65,7 +69,7 @@ function iconv_close(cd::Ptr{Void})
     end
 end
 
-function iconv_open(tocode::ASCIIString, fromcode::ASCIIString)
+function iconv_open(tocode::String, fromcode::String)
     p = ccall((:iconv_open, libiconv), Ptr{Void}, (Cstring, Cstring), tocode, fromcode)
     if p != Ptr{Void}(-1)
         return p
@@ -192,7 +196,7 @@ stream is necessary to complete the encoding (but does not close `stream`).
 `to` and `from` can be specified either as a string or as an `Encoding` object.
 """
 function StringEncoder(stream::IO, to::Encoding, from::Encoding=enc"UTF-8")
-    cd = iconv_open(ASCIIString(to), ASCIIString(from))
+    cd = iconv_open(String(to), String(from))
     inbuf = Vector{UInt8}(BUFSIZE)
     outbuf = Vector{UInt8}(BUFSIZE)
     s = StringEncoder{typeof(from), typeof(to), typeof(stream)}(stream, false,
@@ -225,7 +229,7 @@ function flush(s::StringEncoder)
     s.outbytesleft[] = 0
     while s.outbytesleft[] < BUFSIZE
         iconv!(s.cd, s.inbuf, s.outbuf, s.inbufptr, s.outbufptr, s.inbytesleft, s.outbytesleft)
-        write(s.stream, sub(s.outbuf, 1:(BUFSIZE - Int(s.outbytesleft[]))))
+        write(s.stream, view(s.outbuf, 1:(BUFSIZE - Int(s.outbytesleft[]))))
     end
 
     s
@@ -268,7 +272,7 @@ Note that some implementations (notably the Windows one) may accept invalid sequ
 in the input data without raising an error.
 """
 function StringDecoder(stream::IO, from::Encoding, to::Encoding=enc"UTF-8")
-    cd = iconv_open(ASCIIString(to), ASCIIString(from))
+    cd = iconv_open(String(to), String(from))
     inbuf = Vector{UInt8}(BUFSIZE)
     outbuf = Vector{UInt8}(BUFSIZE)
     s = StringDecoder{typeof(from), typeof(to), typeof(stream)}(stream, false,
@@ -303,7 +307,7 @@ function fill_buffer!(s::StringDecoder)
         return i
     end
 
-    s.inbytesleft[] += readbytes!(s.stream, sub(s.inbuf, Int(s.inbytesleft[]+1):BUFSIZE))
+    s.inbytesleft[] += readbytes!(s.stream, view(s.inbuf, Int(s.inbytesleft[]+1):BUFSIZE))
     iconv!(s.cd, s.inbuf, s.outbuf, s.inbufptr, s.outbufptr, s.inbytesleft, s.outbytesleft)
 end
 
@@ -449,7 +453,7 @@ end
     decode([T,] a::Vector{UInt8}, enc)
 
 Convert an array of bytes `a` representing text in encoding `enc` to a string of type `T`.
-By default, a `UTF8String` is returned.
+By default, a `String` is returned.
 
 `enc` can be specified either as a string or as an `Encoding` object.
 
@@ -486,7 +490,7 @@ end
 
 encode(s::AbstractString, enc::AbstractString) = encode(s, Encoding(enc))
 
-function test_encoding(enc::ASCIIString)
+function test_encoding(enc::String)
     # We assume that an encoding is supported if it's possible to convert from it to UTF-8:
     cd = ccall((:iconv_open, libiconv), Ptr{Void}, (Cstring, Cstring), enc, "UTF-8")
     if cd == Ptr{Void}(-1)

src/encodings.jl

@@ -2,14 +2,21 @@
 
 # Parametric singleton type representing a given string encoding via its symbol parameter
 
+module Encodings
+
+using Compat
 import Base: show, print, convert
-export Encoding, @enc_str
+export encoding, encodings_list, Encoding, @enc_str
+
+if VERSION >= v"0.5.0-"
+    using LegacyStrings: ASCIIString, UTF8String, UTF16String, UTF32String
+end
 
 immutable Encoding{enc} end
 
-Encoding(s) = Encoding{symbol(s)}()
+Encoding(s) = Encoding{Symbol(s)}()
 macro enc_str(s)
-    :(Encoding{$(Expr(:quote, symbol(s)))}())
+    :(Encoding{$(Expr(:quote, Symbol(s)))}())
 end
 
 convert{T<:AbstractString, enc}(::Type{T}, ::Encoding{enc}) = string(enc)
@@ -19,6 +26,10 @@ 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{ASCIIString}) = enc"ASCII"
 encoding(::Type{UTF8String})  = enc"UTF-8"
 
@@ -300,3 +311,4 @@ encodings_list = ["1026", "1046", "1047", "10646-1:1993", "10646-1:1993/UCS4",
                   "x-mac-icelandic", "x-mac-japanese", "x-mac-korean", "x-mac-romanian",
                   "x-mac-thai", "x-mac-turkish", "x-mac-ukrainian", "X0201", "X0208",
                   "X0212", "YU"]
+end # module

test/runtests.jl

@@ -1,5 +1,6 @@
 using Base.Test
-import Compat: readstring
+using Compat: readstring
+using LegacyStrings: UTF8String, UTF16String, UTF32String
 using StringEncodings
 
 for s in ("", "\0", "a", "café crème",
@@ -89,18 +90,14 @@ catch err
         "Byte sequence 0xc3a9e282ac is invalid in source encoding or cannot be represented in target encoding"
 end
 
-# win_iconv currently does not throw an error on bytes >= 0x80 in ASCII sources
-# https://github.com/win-iconv/win-iconv/pull/26
-if OS_NAME != :Windows
-    @test_throws InvalidSequenceError decode(b"qwertyé€", "ASCII")
-    try
-        decode(b"qwertyé€", "ASCII")
-    catch err
-         io = IOBuffer()
-         showerror(io, err)
-         @test takebuf_string(io) ==
-             "Byte sequence 0xc3a9e282ac is invalid in source encoding or cannot be represented in target encoding"
-    end
+@test_throws InvalidSequenceError decode(b"qwertyé€", "ASCII")
+try
+    decode(b"qwertyé€", "ASCII")
+catch err
+     io = IOBuffer()
+     showerror(io, err)
+     @test takebuf_string(io) ==
+         "Byte sequence 0xc3a9e282ac is invalid in source encoding or cannot be represented in target encoding"
 end
 
 let x = encode("ÄÆä", "ISO-8859-1")