Skip to content

all: replace uses of deprecated io/ioutil package #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbinet merged 1 commit into from
Aug 19, 2021
Merged

all: replace uses of deprecated io/ioutil package #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions cmpimg/checkplot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"flag"
"image"
"image/png"
"io/ioutil"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions cmpimg/cmpimg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"image"
"image/draw"
"image/png"
"io/ioutil"
"os"
"path/filepath"
"strings"
"testing"
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
10 changes: 5 additions & 5 deletions plot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"bytes"
"fmt"
"image/color"
"io/ioutil"
"math"
"os"
"testing"
"time"

Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
6 changes: 3 additions & 3 deletions vg/vg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package vg_test
import (
"bytes"
"fmt"
"io/ioutil"
"log"
"os"
"path/filepath"
"strings"
"testing"
Expand Down Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand Down
10 changes: 5 additions & 5 deletions vg/vgimg/vgimg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"bytes"
"fmt"
"image/color"
"io/ioutil"
"log"
"os"
"reflect"
"sync"
"testing"
Expand Down Expand Up @@ -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)
}
Expand All @@ -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")
}
}
Expand Down Expand Up @@ -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)
}
Expand Down
13 changes: 6 additions & 7 deletions vg/vgpdf/vgpdf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"image/color"
"image/png"
"io"
"io/ioutil"
"log"
"math"
"os"
Expand Down Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down
15 changes: 7 additions & 8 deletions vg/vgpdf/vgpdf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"fmt"
"image/color"
"image/png"
"io/ioutil"
"log"
"os"
"testing"
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
8 changes: 4 additions & 4 deletions vg/vgsvg/vgsvg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package vgsvg_test

import (
"bytes"
"io/ioutil"
"os"
"testing"

"gonum.org/v1/plot"
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down