From 68caf6e0353e6dd5b4c05afa951c3f78a67b5ac0 Mon Sep 17 00:00:00 2001 From: Sebastien Binet Date: Fri, 13 Aug 2021 09:30:23 +0200 Subject: [PATCH] all: replace uses of deprecated io/ioutil package This CL has been mechanically applied through 'eg', to replace all uses of io/ioutil.{Read,Write}File with os.{Read,Write}File, and similarly for io/ioutil.Temp{Dir,File}. Removal of io/ioutil.Discard has been applied manually. Fixes gonum/plot#709. --- cmpimg/checkplot.go | 5 ++--- cmpimg/cmpimg_test.go | 14 +++++++------- plot_test.go | 10 +++++----- vg/vg_test.go | 6 +++--- vg/vgimg/vgimg_test.go | 10 +++++----- vg/vgpdf/vgpdf.go | 13 ++++++------- vg/vgpdf/vgpdf_test.go | 15 +++++++-------- vg/vgsvg/vgsvg_test.go | 8 ++++---- 8 files changed, 39 insertions(+), 42 deletions(-) diff --git a/cmpimg/checkplot.go b/cmpimg/checkplot.go index 66fca91a4..47dcc729c 100644 --- a/cmpimg/checkplot.go +++ b/cmpimg/checkplot.go @@ -10,7 +10,6 @@ import ( "flag" "image" "image/png" - "io/ioutil" "os" "path/filepath" "strings" @@ -66,13 +65,13 @@ func CheckPlotApprox(ExampleFunc func(), t *testing.T, delta float64, filenames // Read the images we've just generated and check them against the // Golden Images. for _, path := range paths { - got, err := ioutil.ReadFile(path) + got, err := os.ReadFile(path) if err != nil { t.Errorf("Failed to read %s: %v", path, err) continue } golden := goldenPath(path) - want, err := ioutil.ReadFile(golden) + want, err := os.ReadFile(golden) if err != nil { t.Errorf("Failed to read golden file %s: %v", golden, err) continue diff --git a/cmpimg/cmpimg_test.go b/cmpimg/cmpimg_test.go index 6488111c5..f9fb4e648 100644 --- a/cmpimg/cmpimg_test.go +++ b/cmpimg/cmpimg_test.go @@ -11,7 +11,7 @@ import ( "image" "image/draw" "image/png" - "io/ioutil" + "os" "path/filepath" "strings" "testing" @@ -20,11 +20,11 @@ import ( const wantDiffEncoded = `iVBORw0KGgoAAAANSUhEUgAAAZAAAAEzEAIAAADAxR6YAAAHBklEQVR4nOzYjW3kRABA4RWiC0QXUMami2xRSRfrMu76gDKQZQ3+2907xEMg8X3SXZKxdzwZ29JTfrgAAJASWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAMYEFABATWAAAsR//7QX8X12v8//T9E/NvPje+R+tZjvP9882PjV/naZvf+J8lb96xb+/l+uar9d5zfPX8+rnY/PocvTZ9ebj4+j5TmyPjauNM8f8YyXrGh7NM2ZaPjXmHj8dZx4j+zUsax2zr0fHjGOG9frrOfs9WM/bjmx3bnxmP368/2MHzmtfj61j49/2+tv1bO/Ho1UdzzyO7898NsNx/NU+bHfkeMXZzz+Nnz4/3m/rPXi/He/B6r55Tt+evk3btZ73ffsGfH6MPfn8+PL1cvnydVnB779dLrfb/c/fa+zT9imaXhw9P3fH53H9fbdvwH6/lvdv/zSvT/B4e/dzL2e/7d7bZ98vOzqPvG3mWPZ42d375g1f5tzfgePI8Uk8P3GP1nAc+fWXeWT+f5rmOzH2dn5K9nt0/+b8j97ddYXnt+31vq2zHD+/3onz0XGH3m/P3tBnb8szr2Z5vdOvZzyv6Di+fDdNt9t5Dn/BAgCICSwAgJjAAgCICSwAgJjAAgCICSwAgJjAAgCICSwAgJjAAgCICSwAgJjAAgAAAOC/zV+wAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAICawAABiAgsAIPZHAAAA///KAlB2mCuyaAAAAABJRU5ErkJggg==` func TestDiff(t *testing.T) { - got, err := ioutil.ReadFile(filepath.FromSlash("./testdata/failed_input.png")) + got, err := os.ReadFile(filepath.FromSlash("./testdata/failed_input.png")) if err != nil { t.Fatalf("failed to read failed file: %v", err) } - want, err := ioutil.ReadFile(filepath.FromSlash("./testdata/good_golden.png")) + want, err := os.ReadFile(filepath.FromSlash("./testdata/good_golden.png")) if err != nil { t.Fatalf("failed to read golden file: %v", err) } @@ -56,7 +56,7 @@ func TestDiff(t *testing.T) { } func TestEqual(t *testing.T) { - got, err := ioutil.ReadFile("testdata/approx_got_golden.png") + got, err := os.ReadFile("testdata/approx_got_golden.png") if err != nil { t.Fatal(err) } @@ -71,12 +71,12 @@ func TestEqual(t *testing.T) { } func TestEqualApproxPNG(t *testing.T) { - got, err := ioutil.ReadFile("testdata/approx_got_golden.png") + got, err := os.ReadFile("testdata/approx_got_golden.png") if err != nil { t.Fatal(err) } - want, err := ioutil.ReadFile("testdata/approx_want_golden.png") + want, err := os.ReadFile("testdata/approx_want_golden.png") if err != nil { t.Fatal(err) } @@ -106,7 +106,7 @@ func TestEqualApproxPNG(t *testing.T) { func TestEqualApprox(t *testing.T) { read := func(name string) []byte { - raw, err := ioutil.ReadFile(name) + raw, err := os.ReadFile(name) if err != nil { t.Fatalf("could not read file %q: %+v", name, err) } diff --git a/plot_test.go b/plot_test.go index 30888a7da..05dc74137 100644 --- a/plot_test.go +++ b/plot_test.go @@ -8,8 +8,8 @@ import ( "bytes" "fmt" "image/color" - "io/ioutil" "math" + "os" "testing" "time" @@ -50,19 +50,19 @@ func TestLegendAlignment(t *testing.T) { if *cmpimg.GenerateTestData { // Recreate Golden images and exit. - err := ioutil.WriteFile("testdata/legendAlignment_golden.png", buf.Bytes(), 0o644) + err := os.WriteFile("testdata/legendAlignment_golden.png", buf.Bytes(), 0o644) if err != nil { t.Fatal(err) } return } - err := ioutil.WriteFile("testdata/legendAlignment.png", buf.Bytes(), 0o644) + err := os.WriteFile("testdata/legendAlignment.png", buf.Bytes(), 0o644) if err != nil { t.Fatal(err) } - want, err := ioutil.ReadFile("testdata/legendAlignment_golden.png") + want, err := os.ReadFile("testdata/legendAlignment_golden.png") if err != nil { t.Fatal(err) } @@ -182,7 +182,7 @@ func TestDrawGlyphBoxes(t *testing.T) { t.Fatalf("error: %+v", err) } - err = ioutil.WriteFile("testdata/glyphbox.png", buf.Bytes(), 0644) + err = os.WriteFile("testdata/glyphbox.png", buf.Bytes(), 0644) if err != nil { t.Fatalf("could not save plot: %+v", err) } diff --git a/vg/vg_test.go b/vg/vg_test.go index ff77831bf..916b3edce 100644 --- a/vg/vg_test.go +++ b/vg/vg_test.go @@ -7,8 +7,8 @@ package vg_test import ( "bytes" "fmt" - "io/ioutil" "log" + "os" "path/filepath" "strings" "testing" @@ -63,7 +63,7 @@ func TestLineWidth(t *testing.T) { } } - want, err := ioutil.ReadFile(name) + want, err := os.ReadFile(name) if err != nil { t.Fatalf("failed to read test image [%s]: %v\n", name, err) } @@ -75,7 +75,7 @@ func TestLineWidth(t *testing.T) { if !ok { got := strings.Replace(name, "_golden.", ".", 1) - err = ioutil.WriteFile(got, buf.Bytes(), 0644) + err = os.WriteFile(got, buf.Bytes(), 0644) if err != nil { t.Errorf("could not write plot image %q: %+v", got, err) } diff --git a/vg/vgimg/vgimg_test.go b/vg/vgimg/vgimg_test.go index 88fb368b7..b4d88d926 100644 --- a/vg/vgimg/vgimg_test.go +++ b/vg/vgimg/vgimg_test.go @@ -8,8 +8,8 @@ import ( "bytes" "fmt" "image/color" - "io/ioutil" "log" + "os" "reflect" "sync" "testing" @@ -44,7 +44,7 @@ func TestIssue179(t *testing.T) { t.Fatal(err) } - want, err := ioutil.ReadFile("testdata/issue179_golden.jpg") + want, err := os.ReadFile("testdata/issue179_golden.jpg") if err != nil { t.Fatal(err) } @@ -54,7 +54,7 @@ func TestIssue179(t *testing.T) { t.Fatal(err) } if !ok { - _ = ioutil.WriteFile("testdata/issue179.jpg", b.Bytes(), 0644) + _ = os.WriteFile("testdata/issue179.jpg", b.Bytes(), 0644) t.Fatalf("images differ") } } @@ -129,12 +129,12 @@ func TestIssue540(t *testing.T) { t.Fatal(err) } - want, err := ioutil.ReadFile("testdata/issue540_golden.png") + want, err := os.ReadFile("testdata/issue540_golden.png") if err != nil { t.Fatal(err) } - got, err := ioutil.ReadFile("testdata/issue540.png") + got, err := os.ReadFile("testdata/issue540.png") if err != nil { t.Fatal(err) } diff --git a/vg/vgpdf/vgpdf.go b/vg/vgpdf/vgpdf.go index dfd090c03..67eef7b8a 100644 --- a/vg/vgpdf/vgpdf.go +++ b/vg/vgpdf/vgpdf.go @@ -15,7 +15,6 @@ import ( "image/color" "image/png" "io" - "io/ioutil" "log" "math" "os" @@ -421,7 +420,7 @@ func getFont(key fontKey, font, encoding []byte) (z, j []byte, err error) { } func makeFont(key fontKey, font, encoding []byte) (val fontVal, err error) { - tmpdir, err := ioutil.TempDir("", "gofpdf-makefont-") + tmpdir, err := os.MkdirTemp("", "gofpdf-makefont-") if err != nil { return val, err } @@ -442,30 +441,30 @@ func makeFont(key fontKey, font, encoding []byte) (val fontVal, err error) { fname := filepath.Join(indir, "font.ttf") encname := filepath.Join(indir, "cp1252.map") - err = ioutil.WriteFile(fname, font, 0644) + err = os.WriteFile(fname, font, 0644) if err != nil { return val, err } - err = ioutil.WriteFile(encname, encoding, 0644) + err = os.WriteFile(encname, encoding, 0644) if err != nil { return val, err } - err = pdf.MakeFont(fname, encname, outdir, ioutil.Discard, key.embed) + err = pdf.MakeFont(fname, encname, outdir, io.Discard, key.embed) if err != nil { return val, err } if key.embed { - z, err := ioutil.ReadFile(filepath.Join(outdir, "font.z")) + z, err := os.ReadFile(filepath.Join(outdir, "font.z")) if err != nil { return val, err } val.z = z } - j, err := ioutil.ReadFile(filepath.Join(outdir, "font.json")) + j, err := os.ReadFile(filepath.Join(outdir, "font.json")) if err != nil { return val, err } diff --git a/vg/vgpdf/vgpdf_test.go b/vg/vgpdf/vgpdf_test.go index 265328534..18aa1fa63 100644 --- a/vg/vgpdf/vgpdf_test.go +++ b/vg/vgpdf/vgpdf_test.go @@ -9,7 +9,6 @@ import ( "fmt" "image/color" "image/png" - "io/ioutil" "log" "os" "testing" @@ -62,14 +61,14 @@ func TestEmbedFonts(t *testing.T) { if *cmpimg.GenerateTestData { // Recreate Golden images and exit. - err = ioutil.WriteFile(tc.name, buf.Bytes(), 0o644) + err = os.WriteFile(tc.name, buf.Bytes(), 0o644) if err != nil { t.Fatal(err) } return } - want, err := ioutil.ReadFile(tc.name) + want, err := os.ReadFile(tc.name) if err != nil { t.Fatalf("failed to read golden plot: %v", err) } @@ -131,12 +130,12 @@ func TestArc(t *testing.T) { t.Fatal(err) } - want, err := ioutil.ReadFile("testdata/arc_golden.pdf") + want, err := os.ReadFile("testdata/arc_golden.pdf") if err != nil { t.Fatalf("failed to read golden plot: %v", err) } - got, err := ioutil.ReadFile("testdata/arc.pdf") + got, err := os.ReadFile("testdata/arc.pdf") if err != nil { t.Fatalf("failed to read plot: %v", err) } @@ -191,12 +190,12 @@ func TestIssue540(t *testing.T) { t.Fatal(err) } - want, err := ioutil.ReadFile("testdata/issue540_golden.pdf") + want, err := os.ReadFile("testdata/issue540_golden.pdf") if err != nil { t.Fatal(err) } - got, err := ioutil.ReadFile("testdata/issue540.pdf") + got, err := os.ReadFile("testdata/issue540.pdf") if err != nil { t.Fatal(err) } @@ -243,7 +242,7 @@ func BenchmarkCanvas(b *testing.B) { func BenchmarkCanvasImage(b *testing.B) { c := vgpdf.New(5*vg.Centimeter, 5*vg.Centimeter) - raw, err := ioutil.ReadFile("../../plotter/testdata/gopher.png") + raw, err := os.ReadFile("../../plotter/testdata/gopher.png") if err != nil { b.Fatalf("could not read test image: %+v", err) } diff --git a/vg/vgsvg/vgsvg_test.go b/vg/vgsvg/vgsvg_test.go index 03531975c..e902db7c1 100644 --- a/vg/vgsvg/vgsvg_test.go +++ b/vg/vgsvg/vgsvg_test.go @@ -6,7 +6,7 @@ package vgsvg_test import ( "bytes" - "io/ioutil" + "os" "testing" "gonum.org/v1/plot" @@ -59,7 +59,7 @@ func TestNewWith(t *testing.T) { t.Fatal(err) } - want, err := ioutil.ReadFile("testdata/scatter_golden.svg") + want, err := os.ReadFile("testdata/scatter_golden.svg") if err != nil { t.Fatal(err) } @@ -102,14 +102,14 @@ func TestHtmlEscape(t *testing.T) { if *cmpimg.GenerateTestData { // Recreate Golden images and exit. - err = ioutil.WriteFile("testdata/scatter_line_golden.svg", b.Bytes(), 0o644) + err = os.WriteFile("testdata/scatter_line_golden.svg", b.Bytes(), 0o644) if err != nil { t.Fatal(err) } return } - want, err := ioutil.ReadFile("testdata/scatter_line_golden.svg") + want, err := os.ReadFile("testdata/scatter_line_golden.svg") if err != nil { t.Fatal(err) }