Use Compat.jl for readstring() and read()

Author: nalimilan

REQUIRE

@@ -1,3 +1,4 @@
 julia 0.4
 BinDeps
+Compat
 @windows WinRPM

src/StringEncodings.jl

@@ -3,6 +3,7 @@
 module StringEncodings
 import Base: close, eof, flush, read, readall, write, show
 import Base.Libc: errno, strerror, E2BIG, EINVAL, EILSEQ
+import Compat: read
 
 export StringEncoder, StringDecoder, encode, decode, encodings
 export StringEncodingError, OutputBufferError, IConvError
@@ -337,7 +338,7 @@ in the input data without raising an error.
 function decode{T<:AbstractString}(::Type{T}, a::Vector{UInt8}, enc::Encoding)
     b = IOBuffer(a)
     try
-        T(readbytes(StringDecoder(b, enc, encoding(T))))
+        T(read(StringDecoder(b, enc, encoding(T))))
     finally
         close(b)
     end

test/runtests.jl

@@ -1,4 +1,5 @@
 using Base.Test
+import Compat: readstring
 using StringEncodings
 
 for s in ("", "\0", "a", "café crème",
@@ -46,7 +47,7 @@ let s = "a string チャネルパートナーの選択"
     end
 
     p = StringDecoder(IOBuffer(encode(s, "UTF-16LE")[1:19]), "UTF-16LE")
-    @test readall(p) == s[1:9]
+    @test readstring(p) == s[1:9]
     @test_throws IncompleteSequenceError close(p)
 
     # Test stateful encoding, which output some bytes on final reset
@@ -102,7 +103,7 @@ mktemp() do p, io
     s = "café crème"
     write(io, encode(s, "CP1252"))
     close(io)
-    @test readall(p, enc"CP1252") == s
+    @test readstring(p, enc"CP1252") == s
 end
 
 @test_throws InvalidEncodingError p = StringEncoder(IOBuffer(), "nonexistent_encoding")
@@ -127,10 +128,6 @@ catch err
         "Conversion from nonexistent_encoding to UTF-8 not supported by iconv implementation, check that specified encodings are correct"
 end
 
-if !isdefined(Base, :readstring)
-    readstring = readall
-end
-
 mktemp() do path, io
     s = "a string \0チャネルパ\0ー\0トナーの選択 with embedded and trailing nuls\0"
     write(io, encode(s, "ISO-2022-JP"))