Fix all existing deprecation warnings (#240)

* Fix Distributed module deprecation * Fix IOBuffer deprecation * Fix lpad deprecation * Fix convert fallback deprecation * Fix Symbol convert deprecation
JuliaIO · Feb 20, 2018 · a4ad8ba · a4ad8ba
1 parent 0081227
commit a4ad8ba
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/src/Parser.jl b/src/Parser.jl
@@ -222,7 +222,7 @@ function parse_object(pc::ParserContext{DictType, <:Real}, ps::ParserState) wher
             # Read value
             value = parse_value(pc, ps)
             chomp_space!(ps)
-            obj[convert(keyT, key)] = value
+            obj[keyT === Symbol ? Symbol(key) : convert(keyT, key)] = value
             byteat(ps) == OBJECT_END && break
             skip!(ps, DELIMITER)
         end

diff --git a/src/Writer.jl b/src/Writer.jl
@@ -61,7 +61,7 @@ const IsPrintedAsString = Union{
 lower(x::IsPrintedAsString) = x
 
 lower(m::Module) = throw(ArgumentError("cannot serialize Module $m as JSON"))
-lower(x::Real) = Float64(x)
+lower(x::Real) = convert(Float64, x)
 lower(x::Base.AbstractSet) = collect(x)
 
 """

diff --git a/src/specialized.jl b/src/specialized.jl
@@ -14,7 +14,7 @@ function parse_string(ps::MemoryParserState)
         ps.s = s + len + 2 # byte after closing quote
         return unsafe_string(pointer(ps.utf8)+s, len)
     else
-        String(take!(parse_string(ps, IOBuffer(len))))
+        String(take!(parse_string(ps, IOBuffer(maxsize=len))))
     end
 end
 

diff --git a/test/json-checker.jl b/test/json-checker.jl
@@ -3,15 +3,15 @@
 const JSON_DATA_DIR = joinpath(dirname(@__DIR__), "data")
 
 for i in 1:38
-    file = "fail$(lpad(i, 2, 0)).json"
+    file = "fail$(lpad(string(i), 2, "0")).json"
     filepath = joinpath(JSON_DATA_DIR, "jsonchecker", file)
 
     @test_throws ErrorException JSON.parsefile(filepath)
 end
 
 for i in 1:3
     # Test that the files parse successfully and match streaming parser
-    tf = joinpath(JSON_DATA_DIR, "jsonchecker", "pass$(lpad(i, 2, 0)).json")
+    tf = joinpath(JSON_DATA_DIR, "jsonchecker", "pass$(lpad(string(i), 2, "0")).json")
     @test JSON.parsefile(tf) == open(JSON.parse, tf)
 end
 
@@ -20,7 +20,7 @@ end
 roundtrip(data) = JSON.json(JSON.Parser.parse(data))
 
 for i in 1:27
-    file = "roundtrip$(lpad(i, 2, 0)).json"
+    file = "roundtrip$(lpad(string(i), 2, "0")).json"
     filepath = joinpath(JSON_DATA_DIR, "roundtrip", file)
 
     rt = roundtrip(read(filepath, String))

diff --git a/test/lowering.jl b/test/lowering.jl
@@ -22,7 +22,7 @@ JSON.lower(v::Type151{T}) where {T} = Dict(:type => T, :value => v.x)
     "value" => 1.0)
 
 fixednum = Fixed{Int16, 15}(0.1234)
-@test JSON.parse(JSON.json(fixednum)) == Float64(fixednum)
+@test JSON.parse(JSON.json(fixednum)) == convert(Float64, fixednum)
 
 # test that the default string-serialization of enums can be overriden by
 # `lower` if needed

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -2,6 +2,7 @@ using JSON
 using Compat.Test
 using Compat
 using Compat.Dates
+using Compat.Distributed: RemoteChannel
 using OffsetArrays
 
 import DataStructures
@@ -73,7 +74,7 @@ end
 
 @testset "Regression" begin
     @testset "for issue #$i" for i in [21, 26, 57, 109, 152, 163]
-        include("regression/issue$(lpad(i, 3, '0')).jl")
+        include("regression/issue$(lpad(string(i), 3, "0")).jl")
     end
 end