fixes for 0.7 (#249)

* fixes for 0.7 * fixes for 0.7
JuliaIO · Mar 29, 2018 · f05dd3d · f05dd3d · andreasnoack · May 14, 2018
1 parent fa23bae
commit f05dd3d
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/src/JSON.jl b/src/JSON.jl
@@ -2,6 +2,8 @@ __precompile__()
 
 module JSON
 
+using Compat
+
 export json # returns a compact (or indented) JSON representation as a string
 export JSONText # string wrapper to insert raw JSON into JSON output
 

diff --git a/src/Writer.jl b/src/Writer.jl
@@ -359,8 +359,8 @@ print(io::IO, obj, indent) =
     show_json(io, StandardSerialization(), obj; indent=indent)
 print(io::IO, obj) = show_json(io, StandardSerialization(), obj)
 
-print(a, indent) = print(STDOUT, a, indent)
-print(a) = print(STDOUT, a)
+print(a, indent) = print(stdout, a, indent)
+print(a) = print(stdout, a)
 
 json(a) = sprint(print, a)
 json(a, indent) = sprint(print, a, indent)

diff --git a/src/bytes.jl b/src/bytes.jl
@@ -44,7 +44,7 @@ const ESCAPES = Dict(
     LATIN_T      => TAB)
 
 const REVERSE_ESCAPES = Dict(reverse(p) for p in ESCAPES)
-const ESCAPED_ARRAY = Vector{Vector{UInt8}}(uninitialized, 256)
+const ESCAPED_ARRAY = Vector{Vector{UInt8}}(undef, 256)
 for c in 0x00:0xFF
     ESCAPED_ARRAY[c + 1] = if c == SOLIDUS
         [SOLIDUS]  # don't escape this one
@@ -53,7 +53,11 @@ for c in 0x00:0xFF
     elseif haskey(REVERSE_ESCAPES, c)
         [BACKSLASH, REVERSE_ESCAPES[c]]
     elseif iscntrl(Char(c)) || !isprint(Char(c))
-        UInt8[BACKSLASH, LATIN_U, hex(c, 4)...]
+        if VERSION < v"0.7.0-DEV.4446"
+            UInt8[BACKSLASH, LATIN_U, hex(c, 4)...]
+        else
+            UInt8[BACKSLASH, LATIN_U, string(c, base=16, pad=4)...]
+        end
     else
         [c]
     end

diff --git a/src/specialized.jl b/src/specialized.jl
@@ -62,7 +62,7 @@ function predict_string(ps::MemoryParserState)
             if ps[s] == LATIN_U  # Unicode escape
                 t = ps.s
                 ps.s = s + 1
-                len += write(DevNull, read_unicode_escape!(ps))
+                len += write(devnull, read_unicode_escape!(ps))
                 s = ps.s
                 ps.s = t
                 continue

diff --git a/test/async.jl b/test/async.jl
@@ -1,5 +1,9 @@
 finished_async_tests = RemoteChannel()
 
+if VERSION >= v"0.7.0-DEV.4442"
+    using Sockets
+end
+
 @async begin
     s = listen(7777)
     s = accept(s)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -78,5 +78,4 @@ end
     end
 end
 
-# Check that printing to the default STDOUT doesn't fail
-JSON.print(["JSON.jl tests pass!"], 1)
+# Check that printing to the default stdout doesn't fail
diff --git a/test/serializer.jl b/test/serializer.jl
@@ -74,7 +74,7 @@ end
 struct SingletonType end
 @test_throws ErrorException json(SingletonType())
 
-# test printing to STDOUT
+# test printing to stdout
 let filename = tempname()
     open(filename, "w") do f
         redirect_stdout(f) do

diff --git a/test/standard-serializer.jl b/test/standard-serializer.jl
@@ -46,8 +46,8 @@ end
 @testset "Null bytes" begin
     zeros = Dict("\0" => "\0")
     json_zeros = json(zeros)
-    @test contains(json_zeros,"\\u0000")
-    @test !contains(json_zeros,"\\0")
+    @test occursin("\\u0000", json_zeros)
+    @test !occursin("\\0", json_zeros)
     @test JSON.parse(json_zeros) == zeros
 end