From 3a769549d8f94a68af6ea4ccb9319d3b9a60ea74 Mon Sep 17 00:00:00 2001 From: "femtocleaner[bot]" Date: Mon, 2 Jul 2018 20:33:16 +0000 Subject: [PATCH] Fix deprecations --- src/args.jl | 1 + src/backends/glvisualize.jl | 2 +- src/backends/hdf5.jl | 2 +- src/backends/inspectdr.jl | 8 ++++---- src/backends/pyplot.jl | 24 ++++++++++++------------ src/components.jl | 3 +++ src/series.jl | 2 +- src/utils.jl | 1 + test/imgcomp.jl | 1 + 9 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/args.jl b/src/args.jl index 671485d0..d9e41569 100644 --- a/src/args.jl +++ b/src/args.jl @@ -654,6 +654,7 @@ function handleColors!(d::KW, arg, csym::Symbol) d[csym] = c end return true + catch end false end diff --git a/src/backends/glvisualize.jl b/src/backends/glvisualize.jl index b8a4ed04..b9b2099c 100644 --- a/src/backends/glvisualize.jl +++ b/src/backends/glvisualize.jl @@ -80,7 +80,7 @@ function _initialize_backend(::GLVisualizeBackend; kw...) is_marker_supported(::GLVisualizeBackend, shape::GLVisualize.AllPrimitives) = true is_marker_supported(::GLVisualizeBackend, shape::Union{Vector{Matrix{C}}, Matrix{C}}) where {C<:Colorant} = true is_marker_supported(::GLVisualizeBackend, shape::Shape) = true - const GL = Plots + GL = Plots end end diff --git a/src/backends/hdf5.jl b/src/backends/hdf5.jl index a82a277f..52238146 100644 --- a/src/backends/hdf5.jl +++ b/src/backends/hdf5.jl @@ -146,7 +146,7 @@ function _initialize_backend(::HDF5Backend) export HDF5 if length(HDF5PLOT_MAP_TELEM2STR) < 1 #Possible element types of high-level data types: - const telem2str = Dict{String, Type}( + telem2str = Dict{String, Type}( "NATIVE" => HDF5PlotNative, "VOID" => Void, "BOOL" => Bool, diff --git a/src/backends/inspectdr.jl b/src/backends/inspectdr.jl index 8cc2a22c..32384481 100644 --- a/src/backends/inspectdr.jl +++ b/src/backends/inspectdr.jl @@ -166,7 +166,7 @@ function _initialize_backend(::InspectDRBackend; kw...) export InspectDR #Glyph used when plotting "Shape"s: - const INSPECTDR_GLYPH_SHAPE = InspectDR.GlyphPolyline( + INSPECTDR_GLYPH_SHAPE = InspectDR.GlyphPolyline( 2*InspectDR.GLYPH_SQUARE.x, InspectDR.GLYPH_SQUARE.y ) @@ -347,8 +347,8 @@ end # --------------------------------------------------------------------------- function _inspectdr_setupsubplot(sp::Subplot{InspectDRBackend}) - const plot = sp.o - const strip = plot.strips[1] #Only 1 strip supported with Plots.jl + plot = sp.o + strip = plot.strips[1] #Only 1 strip supported with Plots.jl xaxis = sp[:xaxis]; yaxis = sp[:yaxis] xgrid_show = xaxis[:grid] @@ -406,7 +406,7 @@ end # called just before updating layout bounding boxes... in case you need to prep # for the calcs function _before_layout_calcs(plt::Plot{InspectDRBackend}) - const mplot = _inspectdr_getmplot(plt.o) + mplot = _inspectdr_getmplot(plt.o) if nothing == mplot; return; end mplot.title = plt[:plot_title] diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl index fa86acc3..b6b4d023 100644 --- a/src/backends/pyplot.jl +++ b/src/backends/pyplot.jl @@ -82,21 +82,21 @@ function _initialize_backend(::PyPlotBackend) append!(Base.Multimedia.displays, otherdisplays) export PyPlot - const pycolors = PyPlot.pyimport("matplotlib.colors") - const pypath = PyPlot.pyimport("matplotlib.path") - const mplot3d = PyPlot.pyimport("mpl_toolkits.mplot3d") - const pypatches = PyPlot.pyimport("matplotlib.patches") - const pyfont = PyPlot.pyimport("matplotlib.font_manager") - const pyticker = PyPlot.pyimport("matplotlib.ticker") - const pycmap = PyPlot.pyimport("matplotlib.cm") - const pynp = PyPlot.pyimport("numpy") + pycolors = PyPlot.pyimport("matplotlib.colors") + pypath = PyPlot.pyimport("matplotlib.path") + mplot3d = PyPlot.pyimport("mpl_toolkits.mplot3d") + pypatches = PyPlot.pyimport("matplotlib.patches") + pyfont = PyPlot.pyimport("matplotlib.font_manager") + pyticker = PyPlot.pyimport("matplotlib.ticker") + pycmap = PyPlot.pyimport("matplotlib.cm") + pynp = PyPlot.pyimport("numpy") pynp["seterr"](invalid="ignore") - const pytransforms = PyPlot.pyimport("matplotlib.transforms") - const pycollections = PyPlot.pyimport("matplotlib.collections") - const pyart3d = PyPlot.art3D + pytransforms = PyPlot.pyimport("matplotlib.transforms") + pycollections = PyPlot.pyimport("matplotlib.collections") + pyart3d = PyPlot.art3D # "support" matplotlib v1.5 - const set_facecolor_sym = if PyPlot.version < v"2" + set_facecolor_sym = if PyPlot.version < v"2" warn("You are using Matplotlib $(PyPlot.version), which is no longer officialy supported by the Plots community. To ensure smooth Plots.jl integration update your Matplotlib library to a version >= 2.0.0") :set_axis_bgcolor else diff --git a/src/components.jl b/src/components.jl index 2b1284ce..1953d1f6 100644 --- a/src/components.jl +++ b/src/components.jl @@ -69,6 +69,7 @@ function weave(x,y; ordering = Vector[x,y]) for o in ordering try push!(ret, shift!(o)) + catch end end done = isempty(x) && isempty(y) @@ -388,6 +389,7 @@ function stroke(args...; alpha = nothing) elseif T <: Symbol || T <: AbstractString try color = parse(Colorant, string(arg)) + catch end elseif allAlphas(arg) alpha = arg @@ -420,6 +422,7 @@ function brush(args...; alpha = nothing) elseif T <: Symbol || T <: AbstractString try color = parse(Colorant, string(arg)) + catch end elseif allAlphas(arg) alpha = arg diff --git a/src/series.jl b/src/series.jl index 9af76774..44552aab 100644 --- a/src/series.jl +++ b/src/series.jl @@ -46,7 +46,7 @@ convertToAnyVector(v::Volume, d::KW) = Any[v], nothing # convertToAnyVector(v::AVec{OHLC}, d::KW) = Any[v], nothing # # dates -convertToAnyVector{D<:Union{Date,DateTime}}(dts::AVec{D}, d::KW) = Any[dts], nothing +convertToAnyVector(dts::AVec{D}, d::KW) where {D<:Union{Date,DateTime}} = Any[dts], nothing # list of things (maybe other vectors, functions, or something else) function convertToAnyVector(v::AVec, d::KW) diff --git a/src/utils.jl b/src/utils.jl index 2334d96a..895c66c5 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -307,6 +307,7 @@ function _expand_limits(lims, x) lims[2] = NaNMath.max(lims[2], e2) # catch err # warn(err) + catch end nothing end diff --git a/test/imgcomp.jl b/test/imgcomp.jl index 625d6d77..69810fe5 100644 --- a/test/imgcomp.jl +++ b/test/imgcomp.jl @@ -10,6 +10,7 @@ ENV["MPLBACKEND"] = "Agg" try @eval import PyPlot info("Matplotlib version: $(PyPlot.matplotlib[:__version__])") +catch end