Update to work around changes in Compat in Julia 1.3

Author: ScottPJones

Project.toml

@@ -23,11 +23,17 @@ keywords = ["Strings", "Formatting"]
 license = "MIT"
 name = "Format"
 uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
-version = "1.0.0"
+version = "1.0.1"
 
 [deps]
-Compat  = "34da2185-b29b-5c13-b0c7-acf172513d20"
+Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Random  = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[targets]
+test = ["Test", "Random"]
 
 [compat]
 julia = "^1.0.0"
-Compat = "≥ 1.0.1"

src/Format.jl

@@ -3,17 +3,13 @@ __precompile__(true)
 module Format
 
 import Base.show
-using Compat
-using Compat.Printf
-const V6_COMPAT = VERSION < v"0.7.0-DEV"
-
-_stdout() = @static V6_COMPAT ? STDOUT : stdout
-_codeunits(s) = Vector{UInt8}(@static V6_COMPAT ? s : codeunits(s))
-@static if V6_COMPAT
-    const m_eval = eval
-else
-    m_eval(expr) = Core.eval(@__MODULE__, expr)
-end
+
+using Printf
+const PF = @static VERSION >= v"1.4.0-DEV.180" ? Printf : Base.Printf
+
+_stdout() = stdout
+_codeunits(s) = Vector{UInt8}(codeunits(s))
+m_eval(expr) = Core.eval(@__MODULE__, expr)
 
 export FormatSpec, FormatExpr, printfmt, printfmtln, format, generate_formatter
 export pyfmt, cfmt, fmt

src/cformat.jl

@@ -3,7 +3,7 @@ formatters = Dict{ ASCIIStr, Function }()
 cfmt( fmt::ASCIIStr, x ) = m_eval(Expr(:call, generate_formatter( fmt ), x))
 
 function checkfmt(fmt)
-    test = Base.Printf.parse( fmt )
+    test = PF.parse( fmt )
     (length( test ) == 1 && typeof( test[1] ) <: Tuple) ||
         error( "Only one AND undecorated format string is allowed")
 end
@@ -38,7 +38,7 @@ function generate_formatter( fmt::ASCIIStr )
 end
 
 function addcommasreal(s)
-    dpos = Compat.findfirst( isequal('.'), s )
+    dpos = findfirst( isequal('.'), s )
     dpos !== nothing && return string(addcommas( s[1:dpos-1] ), s[ dpos:end ])
     # find the rightmost digit
     for i in length( s ):-1:1
@@ -49,7 +49,7 @@ end
 
 function addcommasrat(s)
     # commas are added to only the numerator
-    spos = Compat.findfirst( isequal('/'), s )
+    spos = findfirst( isequal('/'), s )
     string(addcommas( s[1:spos-1] ), s[spos:end])
 end
 
@@ -254,10 +254,10 @@ function format( x::T;
             checkwidth = true
         end
     elseif stripzeros && in( actualconv[1], "fFeEs" )
-        dpos = Compat.findfirst( isequal('.'), s )
+        dpos = findfirst( isequal('.'), s )
         dpos === nothing && (dpos = length(s))
         if actualconv[1] in "eEs"
-            epos = Compat.findfirst(isequal(actualconv[1] == 'E' ? 'E' : 'e'), s)
+            epos = findfirst(isequal(actualconv[1] == 'E' ? 'E' : 'e'), s)
             rpos = (epos === nothing) ? length( s ) : (epos-1)
         else
             rpos = length(s)

src/fmt.jl

@@ -125,7 +125,7 @@ end
 
 function _optional_commas(x::Real, s::AbstractString, fspec::FormatSpec)
     prevwidth = length(s)
-    dpos = Compat.findfirst( isequal('.'), s)
+    dpos = findfirst( isequal('.'), s)
     s = dpos === nothing ? addcommas(s) : string(addcommas(s[1:dpos-1]), '.', s[dpos+1:end])
 
     # check for excess width from commas

src/fmtcore.jl

@@ -159,7 +159,7 @@ end
 
 function _pfmt_f(out::IO, fs::FormatSpec, x::AbstractFloat)
     # separate sign, integer, and decimal part
-    rax = Compat.round(abs(x), digits = fs.prec)
+    rax = round(abs(x); digits = fs.prec)
     sch = _signchar(x, fs.sign)
     intv = trunc(Integer, rax)
     decv = rax - intv
@@ -214,7 +214,7 @@ function _pfmt_e(out::IO, fs::FormatSpec, x::AbstractFloat)
         e = 0
         u = zero(x)
     else
-        rax = Compat.round(ax, sigdigits = fs.prec + 1)
+        rax = round(ax; sigdigits = fs.prec + 1)
         e = floor(Integer, log10(rax))  # exponent
         u = rax * exp10(-e)  # significand
     end

src/formatexpr.jl

@@ -26,7 +26,7 @@ function make_argspec(s::AbstractString, pos::Int)
     ff::Function = Base.identity
 
     if !isempty(s)
-        filrange = Compat.findfirst("|>", s)
+        filrange = findfirst("|>", s)
         if filrange === nothing
             iarg = parse(Int, s)
         else
@@ -64,7 +64,7 @@ end
 function make_formatentry(s::AbstractString, pos::Int)
     @assert s[1] == '{' && s[end] == '}'
     sc = s[2:prevind(s, lastindex(s))]
-    icolon = Compat.findfirst(isequal(':'), sc)
+    icolon = findfirst(isequal(':'), sc)
     if icolon === nothing  # no colon
         (argspec, pos) = make_argspec(sc, pos)
         spec = FormatSpec('s')
@@ -89,10 +89,10 @@ _raise_unmatched_lbrace() = error("Unmatched { in format expression.")
 
 function find_next_entry_open(s::AbstractString, si::Int)
     slen = lastindex(s)
-    p = Compat.findnext(isequal('{'), s, si)
+    p = findnext(isequal('{'), s, si)
     (p === nothing || p < slen) || _raise_unmatched_lbrace()
     while p !== nothing && s[p+1] == '{'  # escape `{{`
-        p = Compat.findnext(isequal('{'), s, p+2)
+        p = findnext(isequal('{'), s, p+2)
         (p === nothing || p < slen) || _raise_unmatched_lbrace()
     end
     pre = p !== nothing ? s[si:prevind(s, p)] : s[si:end]
@@ -104,7 +104,7 @@ function find_next_entry_open(s::AbstractString, si::Int)
 end
 
 function find_next_entry_close(s::AbstractString, si::Int)
-    p = Compat.findnext(isequal('}'), s, si)
+    p = findnext(isequal('}'), s, si)
     p !== nothing || _raise_unmatched_lbrace()
     return p
 end

test/cformat.jl

@@ -1,7 +1,7 @@
 _erfinv(z) = sqrt(π) * Base.Math.@horner(z, 0, 1, 0, π/12, 0, 7π^2/480, 0, 127π^3/40320, 0,
                                          4369π^4/5806080, 0, 34807π^5/182476800) / 2
 
-set_seed!(seed) = @static VERSION < v"0.7.0" ? srand(seed) : Random.seed!(seed)
+set_seed!(seed) = Random.seed!(seed)
 
 function test_equality()
     println( "test cformat equality...")

test/runtests.jl

@@ -1,7 +1,7 @@
 using Format
-using Compat.Test
-using Compat.Printf
-using Compat.Random
+using Test
+using Printf
+using Random
 
 @testset "cformat"    begin include( "cformat.jl" ) end
 @testset "fmtspec"    begin include( "fmtspec.jl" ) end