From bb180ad59a9d61e888e4da6412d0956ca524e34a Mon Sep 17 00:00:00 2001 From: Thomas Breloff Date: Wed, 20 Jul 2016 09:40:10 -0400 Subject: [PATCH] UTF8String to String --- src/axes.jl | 2 +- src/precompile.jl | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/axes.jl b/src/axes.jl index 08e1b93f..d101ace5 100644 --- a/src/axes.jl +++ b/src/axes.jl @@ -167,7 +167,7 @@ function optimal_ticks_and_labels(axis::Axis, ticks = nothing) ticklabels = if any(isfinite, cv) map(labelfunc(scale, backend()), Showoff.showoff(cv, :plain)) else - UTF8String[] + String[] end tickvals = map(invscalefunc(scale), cv) diff --git a/src/precompile.jl b/src/precompile.jl index 4e3e45fe..c2dd87a2 100644 --- a/src/precompile.jl +++ b/src/precompile.jl @@ -9,7 +9,7 @@ function _precompile_() precompile(Plots._plot!, (Plots.Plot{Plots.PyPlotBackend}, Base.Dict{Symbol, Any}, Base.LinSpace{Float64},)) precompile(Plots._plot!, (Plots.Plot{Plots.PyPlotBackend}, Base.Dict{Symbol, Any}, DataFrames.DataFrame,)) precompile(Plots._plot!, (Plots.Plot{Plots.PyPlotBackend}, Base.Dict{Symbol, Any}, Array{Int64, 1},)) - precompile(Plots._plot!, (Plots.Plot{Plots.PyPlotBackend}, Base.Dict{Symbol, Any}, Array{Union{UTF8String, ASCIIString}, 1},)) + precompile(Plots._plot!, (Plots.Plot{Plots.PyPlotBackend}, Base.Dict{Symbol, Any}, Array{Union{String, ASCIIString}, 1},)) precompile(Plots._plot!, (Plots.Plot{Plots.PyPlotBackend}, Base.Dict{Symbol, Any}, Array{Function, 1},)) precompile(Plots._plot!, (Plots.Plot{Plots.PyPlotBackend}, Base.Dict{Symbol, Any}, Array{ASCIIString, 1},)) precompile(Plots._plot!, (Plots.Plot{Plots.UnicodePlotsBackend}, Base.Dict{Symbol, Any},)) @@ -81,13 +81,13 @@ function _precompile_() precompile(Plots._update_subplot_args, (Array{Any, 1}, Plots.Plot{Plots.UnicodePlotsBackend}, Plots.Subplot{Plots.UnicodePlotsBackend}, Base.Dict{Symbol, Any}, Int64,)) precompile(Plots.call, (Array{Any, 1}, Type{Plots.Subplot}, Plots.PyPlotBackend,)) precompile(Plots._update_subplot_args, (Array{Any, 1}, Plots.Plot{Plots.PyPlotBackend}, Plots.Subplot{Plots.PyPlotBackend}, Base.Dict{Symbol, Any}, Int64,)) - precompile(Plots.extractGroupArgs, (Array{Union{UTF8String, ASCIIString}, 1},)) + precompile(Plots.extractGroupArgs, (Array{Union{String, ASCIIString}, 1},)) precompile(Plots.bbox_to_pcts, (Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Bool,)) precompile(Plots.plot, (Array{Any, 1}, Array{Float64, 1},)) precompile(Plots.py_marker, (Plots.Shape,)) precompile(Plots.getindex, (Plots.Subplot{Plots.UnicodePlotsBackend}, Symbol,)) precompile(Plots.getindex, (Plots.Subplot{Plots.PyPlotBackend}, Symbol,)) - precompile(Plots.discrete_value!, (Plots.Axis, Array{Union{UTF8String, ASCIIString}, 1},)) + precompile(Plots.discrete_value!, (Plots.Axis, Array{Union{String, ASCIIString}, 1},)) precompile(Plots.prepare_output, (Plots.Plot{Plots.PyPlotBackend},)) precompile(Plots.update_inset_bboxes!, (Plots.Plot{Plots.PyPlotBackend},)) precompile(Plots.add_layout_pct!, (Base.Dict{Symbol, Any}, Expr, Int64, Int64,)) @@ -121,11 +121,11 @@ function _precompile_() precompile(Plots.plot!, (Array{Any, 1}, Plots.Plot{Plots.PyPlotBackend}, Base.LinSpace{Float64},)) precompile(Plots.plot!, (Array{Any, 1}, Base.LinSpace{Float64}, Array{Float64, 1},)) precompile(Plots.get_zvalues, (Int64,)) - precompile(Plots.plot, (Array{Any, 1}, Array{Union{UTF8String, ASCIIString}, 1}, Array{Union{UTF8String, ASCIIString}, 1},)) + precompile(Plots.plot, (Array{Any, 1}, Array{Union{String, ASCIIString}, 1}, Array{Union{String, ASCIIString}, 1},)) precompile(Plots.histogram, (Array{Any, 1}, Array{Float64, 1},)) precompile(Plots.hline!, (Array{Any, 1}, Array{Float64, 2},)) precompile(Plots.layout_args, (Base.Dict{Symbol, Any}, Int64,)) - precompile(Plots.heatmap, (Array{Any, 1}, Array{Union{UTF8String, ASCIIString}, 1},)) + precompile(Plots.heatmap, (Array{Any, 1}, Array{Union{String, ASCIIString}, 1},)) precompile(Plots._replace_linewidth, (Base.Dict{Symbol, Any},)) precompile(Plots.plot!, (Array{Any, 1}, Array{Float64, 1}, Array{Float64, 1},)) precompile(Plots.plot!, (Array{Any, 1}, Plots.Plot{Plots.PyPlotBackend}, Array{Float64, 2},)) @@ -156,7 +156,7 @@ function _precompile_() precompile(Plots.call, (Type{Plots.Plot},)) precompile(Plots.call, (Type{Plots.ColorGradient}, Array{ColorTypes.RGBA{Float64}, 1},)) precompile(Plots.plot!, (Array{Any, 1}, Array{Int64, 1},)) - precompile(Plots.getExtension, (UTF8String,)) + precompile(Plots.getExtension, (String,)) precompile(Plots.call, (Array{Any, 1}, Type{Plots.EmptyLayout},)) precompile(Plots.update!, (Array{Any, 1}, Plots.Axis,)) precompile(Plots.frame, (Plots.Animation, Plots.Plot{Plots.PyPlotBackend},)) @@ -250,7 +250,7 @@ function _precompile_() precompile(Plots.allShapes, (Plots.Stroke,)) precompile(Plots.replaceAliases!, (Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any},)) precompile(Plots._create_backend_figure, (Plots.Plot{Plots.PyPlotBackend},)) - precompile(Plots.png, (Plots.Plot{Plots.PyPlotBackend}, UTF8String,)) + precompile(Plots.png, (Plots.Plot{Plots.PyPlotBackend}, String,)) precompile(Plots.processFillArg, (Base.Dict{Symbol, Any}, Symbol,)) precompile(Plots.allShapes, (Plots.Shape,)) precompile(Plots.handleColors!, (Base.Dict{Symbol, Any}, Plots.Stroke, Symbol,)) @@ -300,7 +300,7 @@ function _precompile_() precompile(Plots.plotarea!, (Plots.Subplot{Plots.PyPlotBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}},)) precompile(Plots.like_surface, (Symbol,)) precompile(Plots.build_layout, (Base.Dict{Symbol, Any},)) - precompile(Plots.compute_xyz, (Array{Union{UTF8String, ASCIIString}, 1}, Array{Union{UTF8String, ASCIIString}, 1}, Plots.Surface{Array{Float64, 2}},)) + precompile(Plots.compute_xyz, (Array{Union{String, ASCIIString}, 1}, Array{Union{String, ASCIIString}, 1}, Plots.Surface{Array{Float64, 2}},)) precompile(Plots.py_linestyle, (Symbol, Symbol,)) precompile(Plots.plot!, (Array{Float64, 2},)) precompile(Plots.plot!, (Plots.Plot{Plots.PyPlotBackend}, Array{Float64, 2},)) @@ -309,7 +309,7 @@ function _precompile_() precompile(Plots.yaxis!, (ASCIIString, Symbol,)) precompile(Plots.compute_xyz, (Base.LinSpace{Float64}, Array{Float64, 1}, Void,)) precompile(Plots.isijulia, ()) - precompile(Plots.addExtension, (UTF8String, ASCIIString,)) + precompile(Plots.addExtension, (String, ASCIIString,)) precompile(Plots.call, (Type{Plots.ColorGradient}, Array{ColorTypes.RGBA{Float64}, 1}, Array{Float64, 1},)) precompile(Plots.expand_extrema!, (Plots.Subplot{Plots.PyPlotBackend}, Float64, Float64, Float64, Float64,)) precompile(Plots.plotarea!, (Plots.GridLayout, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}},))