Skip to content

Commit c398aac

Browse files
committed
all: remove use of deprecated io/ioutil package
1 parent d6a3924 commit c398aac

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed

compile/compile_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package compile
1010

1111
import (
1212
"fmt"
13-
"io/ioutil"
13+
"io"
1414
"os/exec"
1515
"testing"
1616

@@ -118,7 +118,7 @@ func EqCodeCode(t *testing.T, name string, a, b string) {
118118
t.Errorf("%s code want %q, got %q", name, a, b)
119119
return
120120
}
121-
stdoutData, err := ioutil.ReadAll(stdout)
121+
stdoutData, err := io.ReadAll(stdout)
122122
if err != nil {
123123
t.Fatalf("Failed to read data: %v", err)
124124
}

modules/runtime.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package modules
66

77
import (
88
"bytes"
9-
"io/ioutil"
109
"os"
1110
"path"
1211
"path/filepath"
@@ -145,7 +144,7 @@ func (ctx *context) ResolveAndCompile(pathname string, opts py.CompileOpts) (py.
145144
switch ext {
146145
case ".py":
147146
var pySrc []byte
148-
pySrc, err = ioutil.ReadFile(fpath)
147+
pySrc, err = os.ReadFile(fpath)
149148
if err != nil {
150149
return false, py.ExceptionNewf(py.OSError, "Error reading %q: %v", fpath, err)
151150
}

parser/testparser/testparser.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package main
77
import (
88
"flag"
99
"fmt"
10-
"io/ioutil"
10+
"io"
1111
"log"
1212
"os"
1313

@@ -47,7 +47,7 @@ func main() {
4747
_, err = parser.Lex(in, path, "exec")
4848
} else if *compileFile {
4949
var input []byte
50-
input, err = ioutil.ReadAll(in)
50+
input, err = io.ReadAll(in)
5151
if err != nil {
5252
log.Fatalf("Failed to read %q: %v", path, err)
5353
}

py/file.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ package py
1111

1212
import (
1313
"io"
14-
"io/ioutil"
1514
"os"
1615
)
1716

@@ -129,7 +128,7 @@ func (o *File) Read(args Tuple, kwargs StringDict) (Object, error) {
129128
return nil, ExceptionNewf(TypeError, "read() argument 1 must be int, not %s", arg.Type().Name)
130129
}
131130

132-
b, err := ioutil.ReadAll(r)
131+
b, err := io.ReadAll(r)
133132
if err != nil {
134133
if err == io.EOF {
135134
return o.readResult(nil)

pytest/pytest.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package pytest
66

77
import (
8-
"io/ioutil"
8+
"io"
99
"os"
1010
"path"
1111
"strings"
@@ -31,7 +31,7 @@ func compileProgram(t testing.TB, prog string) (*py.Module, *py.Code) {
3131
}
3232
}()
3333

34-
str, err := ioutil.ReadAll(f)
34+
str, err := io.ReadAll(f)
3535
if err != nil {
3636
t.Fatalf("%s: ReadAll failed: %v", prog, err)
3737
}
@@ -92,7 +92,7 @@ func run(t testing.TB, module *py.Module, code *py.Code) {
9292

9393
// find the python files in the directory passed in
9494
func findFiles(t testing.TB, testDir string) (names []string) {
95-
files, err := ioutil.ReadDir(testDir)
95+
files, err := os.ReadDir(testDir)
9696
if err != nil {
9797
t.Fatalf("ReadDir failed: %v", err)
9898
}

0 commit comments

Comments
 (0)