tUse Base.IOError instead of IOError - Granular.jl - Julia package for granular… | |
git clone git://src.adamsgaard.dk/Granular.jl | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 48c4016fe75110a54780220b872c6d04cb709e70 | |
parent 267a7633ffdaffb82f48398ae7fa41dd87d41afa | |
Author: Anders Damsgaard <[email protected]> | |
Date: Sun, 12 Aug 2018 16:51:33 +0200 | |
Use Base.IOError instead of IOError | |
Diffstat: | |
M src/io.jl | 10 +++++----- | |
M test/grain.jl | 2 +- | |
M test/vtk.jl | 4 ++-- | |
3 files changed, 8 insertions(+), 8 deletions(-) | |
--- | |
diff --git a/src/io.jl b/src/io.jl | |
t@@ -1168,7 +1168,7 @@ function render(simulation::Simulation; pvpython::String… | |
rm("$(simulation.id)/$(simulation.id).avi") | |
end | |
catch return_signal | |
- if isa(return_signal, IOError) | |
+ if isa(return_signal, Base.IOError) | |
@warn "Could not run external ffmpeg command, " * | |
"skipping conversion from " * | |
"$(simulation.id)/$(simulation.id).avi to mp4." | |
t@@ -1200,14 +1200,14 @@ function render(simulation::Simulation; pvpython::Stri… | |
$(simulation.id)/$(simulation.id)-reverse.gif`) | |
end | |
catch return_signal | |
- if isa(return_signal, IOError) | |
+ if isa(return_signal, Base.IOError) | |
@warn "Skipping gif merge since `$convert` " * | |
"was not found." | |
end | |
end | |
end | |
catch return_signal | |
- if isa(return_signal, IOError) | |
+ if isa(return_signal, Base.IOError) | |
error("`pvpython` was not found.") | |
end | |
end | |
t@@ -1318,7 +1318,7 @@ function plotGrainSizeDistribution(simulation::Simulatio… | |
try | |
run(`gnuplot $gnuplotscript`) | |
catch return_signal | |
- if isa(return_signal, IOError) | |
+ if isa(return_signal, Base.IOError) | |
error("Could not launch external gnuplot process") | |
end | |
end | |
t@@ -1545,7 +1545,7 @@ function plotGrains(sim::Simulation; | |
try | |
run(`gnuplot $gnuplotscript`) | |
catch return_signal | |
- if isa(return_signal, IOError) | |
+ if isa(return_signal, Base.IOError) | |
error("Could not launch external gnuplot process") | |
end | |
end | |
diff --git a/test/grain.jl b/test/grain.jl | |
t@@ -33,7 +33,7 @@ global gnuplot = true | |
try | |
run(`gnuplot --version`) | |
catch return_signal | |
- if isa(return_signal, IOError) | |
+ if isa(return_signal, Base.IOError) | |
@warn "Skipping plotting routines: Could not launch gnuplot process" | |
global gnuplot = false | |
end | |
diff --git a/test/vtk.jl b/test/vtk.jl | |
t@@ -76,7 +76,7 @@ Granular.writeParaviewPythonScript(sim, | |
try | |
run(`pvpython $(sim.id)/$(sim.id).py`) | |
catch return_signal | |
- if !isa(return_signal, IOError) | |
+ if !isa(return_signal, Base.IOError) | |
@test isfile("$(sim.id)/$(sim.id).avi") | |
end | |
end | |
t@@ -87,7 +87,7 @@ Granular.writeParaviewPythonScript(sim, | |
try | |
run(`pvpython $(sim.id)/$(sim.id).py`) | |
catch return_signal | |
- if !isa(return_signal, IOError) | |
+ if !isa(return_signal, Base.IOError) | |
@test isfile("$(sim.id)/$(sim.id).0000.png") | |
@test isfile("$(sim.id)/$(sim.id).0014.png") | |
Granular.render(sim) |