Merge pull request #1592 from JuliaPlots/revert-1591-fbot/deps

Revert "Fix deprecations"

src/args.jl

@@ -654,7 +654,6 @@ function handleColors!(d::KW, arg, csym::Symbol)
             d[csym] = c
         end
         return true
-    catch
     end
     false
 end

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
-        GL = Plots
+        const GL = Plots
     end
 end
 

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:
-            telem2str = Dict{String, Type}(
+            const telem2str = Dict{String, Type}(
                 "NATIVE" => HDF5PlotNative,
                 "VOID" => Void,
                 "BOOL" => Bool,

src/backends/inspectdr.jl

@@ -166,7 +166,7 @@ function _initialize_backend(::InspectDRBackend; kw...)
         export InspectDR
 
         #Glyph used when plotting "Shape"s:
-        INSPECTDR_GLYPH_SHAPE = InspectDR.GlyphPolyline(
+        const 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})
-    plot = sp.o
+    const plot = sp.o
-    strip = plot.strips[1] #Only 1 strip supported with Plots.jl
+    const 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})
-    mplot = _inspectdr_getmplot(plt.o)
+    const mplot = _inspectdr_getmplot(plt.o)
     if nothing == mplot; return; end
 
     mplot.title = plt[:plot_title]

src/backends/pyplot.jl

@@ -82,21 +82,21 @@ function _initialize_backend(::PyPlotBackend)
         append!(Base.Multimedia.displays, otherdisplays)
 
         export PyPlot
-        pycolors = PyPlot.pyimport("matplotlib.colors")
+        const pycolors = PyPlot.pyimport("matplotlib.colors")
-        pypath = PyPlot.pyimport("matplotlib.path")
+        const pypath = PyPlot.pyimport("matplotlib.path")
-        mplot3d = PyPlot.pyimport("mpl_toolkits.mplot3d")
+        const mplot3d = PyPlot.pyimport("mpl_toolkits.mplot3d")
-        pypatches = PyPlot.pyimport("matplotlib.patches")
+        const pypatches = PyPlot.pyimport("matplotlib.patches")
-        pyfont = PyPlot.pyimport("matplotlib.font_manager")
+        const pyfont = PyPlot.pyimport("matplotlib.font_manager")
-        pyticker = PyPlot.pyimport("matplotlib.ticker")
+        const pyticker = PyPlot.pyimport("matplotlib.ticker")
-        pycmap = PyPlot.pyimport("matplotlib.cm")
+        const pycmap = PyPlot.pyimport("matplotlib.cm")
-        pynp = PyPlot.pyimport("numpy")
+        const pynp = PyPlot.pyimport("numpy")
         pynp["seterr"](invalid="ignore")
-        pytransforms = PyPlot.pyimport("matplotlib.transforms")
+        const pytransforms = PyPlot.pyimport("matplotlib.transforms")
-        pycollections = PyPlot.pyimport("matplotlib.collections")
+        const pycollections = PyPlot.pyimport("matplotlib.collections")
-        pyart3d = PyPlot.art3D
+        const pyart3d = PyPlot.art3D
 
         # "support" matplotlib v1.5
-        set_facecolor_sym = if PyPlot.version < v"2"
+        const 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

src/components.jl

@@ -69,7 +69,6 @@ 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)
@@ -389,7 +388,6 @@ function stroke(args...; alpha = nothing)
     elseif T <: Symbol || T <: AbstractString
       try
         color = parse(Colorant, string(arg))
-      catch
       end
     elseif allAlphas(arg)
       alpha = arg
@@ -422,7 +420,6 @@ function brush(args...; alpha = nothing)
     elseif T <: Symbol || T <: AbstractString
       try
         color = parse(Colorant, string(arg))
-      catch
       end
     elseif allAlphas(arg)
       alpha = arg

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(dts::AVec{D}, d::KW) where {D<:Union{Date,DateTime}} = Any[dts], nothing
+convertToAnyVector{D<:Union{Date,DateTime}}(dts::AVec{D}, d::KW) = Any[dts], nothing
 
 # list of things (maybe other vectors, functions, or something else)
 function convertToAnyVector(v::AVec, d::KW)

src/utils.jl

@@ -307,7 +307,6 @@ function _expand_limits(lims, x)
     lims[2] = NaNMath.max(lims[2], e2)
   # catch err
   #   warn(err)
-  catch
   end
   nothing
 end

test/imgcomp.jl

@@ -10,7 +10,6 @@ ENV["MPLBACKEND"] = "Agg"
 try
   @eval import PyPlot
   info("Matplotlib version: $(PyPlot.matplotlib[:__version__])")
-catch
 end