Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 983e4b3

Browse files
floschflosch
committed
chore: move from deprecated ioutil to os/io pkg
1 parent 9341d07 commit 983e4b3

File tree

6 files changed

+27
-32
lines changed

6 files changed

+27
-32
lines changed

‎pongo2_template_test.go‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"encoding/json"
66
"errors"
77
"fmt"
8-
"io/ioutil"
8+
"io"
99
"os"
1010
"path/filepath"
1111
"regexp"
@@ -100,7 +100,7 @@ func init() {
100100
pongo2.DefaultSet.BanFilter("banned_filter")
101101
pongo2.DefaultSet.BanTag("banned_tag")
102102

103-
f, err := ioutil.TempFile(os.TempDir(), "pongo2_")
103+
f, err := os.CreateTemp(os.TempDir(), "pongo2_")
104104
if err != nil {
105105
panic(fmt.Sprintf("cannot write to %s", os.TempDir()))
106106
}
@@ -382,15 +382,15 @@ func TestTemplates(t *testing.T) {
382382
}
383383

384384
// Read options from file
385-
optsStr, _ := ioutil.ReadFile(fmt.Sprintf("%s.options", match))
385+
optsStr, _ := os.ReadFile(fmt.Sprintf("%s.options", match))
386386
trimBlocks := strings.Contains(string(optsStr), "TrimBlocks=true")
387387
lStripBlocks := strings.Contains(string(optsStr), "LStripBlocks=true")
388388

389389
tpl.Options.TrimBlocks = trimBlocks
390390
tpl.Options.LStripBlocks = lStripBlocks
391391

392392
testFilename := fmt.Sprintf("%s.out", match)
393-
testOut, rerr := ioutil.ReadFile(testFilename)
393+
testOut, rerr := os.ReadFile(testFilename)
394394
if rerr != nil {
395395
t.Fatalf("Error on ReadFile('%s'): %s", testFilename, rerr.Error())
396396
}
@@ -402,7 +402,7 @@ func TestTemplates(t *testing.T) {
402402
if !bytes.Equal(testOut, tplOut) {
403403
t.Logf("Template (rendered) '%s': '%s'", match, tplOut)
404404
errFilename := filepath.Base(fmt.Sprintf("%s.error", match))
405-
err := ioutil.WriteFile(errFilename, []byte(tplOut), 0o600)
405+
err := os.WriteFile(errFilename, []byte(tplOut), 0o600)
406406
if err != nil {
407407
t.Fatalf(err.Error())
408408
}
@@ -430,7 +430,7 @@ func TestBlockTemplates(t *testing.T) {
430430
}
431431

432432
testFilename := fmt.Sprintf("%s.out", match)
433-
testOut, rerr := ioutil.ReadFile(testFilename)
433+
testOut, rerr := os.ReadFile(testFilename)
434434
if rerr != nil {
435435
t.Fatalf("Error on ReadFile('%s'): %s", testFilename, rerr.Error())
436436
}
@@ -450,7 +450,7 @@ func TestBlockTemplates(t *testing.T) {
450450
if testString != joinedString {
451451
t.Logf("BlockTemplate (rendered) '%s': '%s'", match, tpl_out["content"])
452452
errFilename := filepath.Base(fmt.Sprintf("%s.error", match))
453-
err := ioutil.WriteFile(errFilename, []byte(joinedString), 0o600)
453+
err := os.WriteFile(errFilename, []byte(joinedString), 0o600)
454454
if err != nil {
455455
t.Fatalf(err.Error())
456456
}
@@ -489,14 +489,14 @@ func TestExecutionErrors(t *testing.T) {
489489
}
490490
for idx, match := range matches {
491491
t.Run(fmt.Sprintf("%03d-%s", idx+1, match), func(t *testing.T) {
492-
testData, err := ioutil.ReadFile(match)
492+
testData, err := os.ReadFile(match)
493493
if err != nil {
494494
t.Fatalf("could not read file '%v': %v", match, err)
495495
}
496496
tests := strings.Split(string(testData), "\n")
497497

498498
checkFilename := fmt.Sprintf("%s.out", match)
499-
checkData, err := ioutil.ReadFile(checkFilename)
499+
checkData, err := os.ReadFile(checkFilename)
500500
if err != nil {
501501
t.Fatalf("Error on ReadFile('%s'): %s", checkFilename, err.Error())
502502
}
@@ -550,14 +550,14 @@ func TestCompilationErrors(t *testing.T) {
550550
}
551551
for idx, match := range matches {
552552
t.Run(fmt.Sprintf("%03d-%s", idx+1, match), func(t *testing.T) {
553-
testData, err := ioutil.ReadFile(match)
553+
testData, err := os.ReadFile(match)
554554
if err != nil {
555555
t.Fatalf("could not read file '%v': %v", match, err)
556556
}
557557
tests := strings.Split(string(testData), "\n")
558558

559559
checkFilename := fmt.Sprintf("%s.out", match)
560-
checkData, err := ioutil.ReadFile(checkFilename)
560+
checkData, err := os.ReadFile(checkFilename)
561561
if err != nil {
562562
t.Fatalf("error on ReadFile('%s'): %s", checkFilename, err.Error())
563563
}
@@ -628,7 +628,7 @@ func BenchmarkCache(b *testing.B) {
628628
if err != nil {
629629
b.Fatal(err)
630630
}
631-
err = tpl.ExecuteWriterUnbuffered(tplContext, ioutil.Discard)
631+
err = tpl.ExecuteWriterUnbuffered(tplContext, io.Discard)
632632
if err != nil {
633633
b.Fatal(err)
634634
}
@@ -643,7 +643,7 @@ func BenchmarkCacheDebugOn(b *testing.B) {
643643
if err != nil {
644644
b.Fatal(err)
645645
}
646-
err = tpl.ExecuteWriterUnbuffered(tplContext, ioutil.Discard)
646+
err = tpl.ExecuteWriterUnbuffered(tplContext, io.Discard)
647647
if err != nil {
648648
b.Fatal(err)
649649
}
@@ -657,15 +657,15 @@ func BenchmarkExecuteComplexWithSandboxActive(b *testing.B) {
657657
}
658658
b.ResetTimer()
659659
for i := 0; i < b.N; i++ {
660-
err = tpl.ExecuteWriterUnbuffered(tplContext, ioutil.Discard)
660+
err = tpl.ExecuteWriterUnbuffered(tplContext, io.Discard)
661661
if err != nil {
662662
b.Fatal(err)
663663
}
664664
}
665665
}
666666

667667
func BenchmarkCompileAndExecuteComplexWithSandboxActive(b *testing.B) {
668-
buf, err := ioutil.ReadFile("template_tests/complex.tpl")
668+
buf, err := os.ReadFile("template_tests/complex.tpl")
669669
if err != nil {
670670
b.Fatal(err)
671671
}
@@ -677,7 +677,7 @@ func BenchmarkCompileAndExecuteComplexWithSandboxActive(b *testing.B) {
677677
b.Fatal(err)
678678
}
679679

680-
err = tpl.ExecuteWriterUnbuffered(tplContext, ioutil.Discard)
680+
err = tpl.ExecuteWriterUnbuffered(tplContext, io.Discard)
681681
if err != nil {
682682
b.Fatal(err)
683683
}
@@ -692,7 +692,7 @@ func BenchmarkParallelExecuteComplexWithSandboxActive(b *testing.B) {
692692
b.ResetTimer()
693693
b.RunParallel(func(pb *testing.PB) {
694694
for pb.Next() {
695-
err := tpl.ExecuteWriterUnbuffered(tplContext, ioutil.Discard)
695+
err := tpl.ExecuteWriterUnbuffered(tplContext, io.Discard)
696696
if err != nil {
697697
b.Fatal(err)
698698
}
@@ -708,15 +708,15 @@ func BenchmarkExecuteComplexWithoutSandbox(b *testing.B) {
708708
}
709709
b.ResetTimer()
710710
for i := 0; i < b.N; i++ {
711-
err = tpl.ExecuteWriterUnbuffered(tplContext, ioutil.Discard)
711+
err = tpl.ExecuteWriterUnbuffered(tplContext, io.Discard)
712712
if err != nil {
713713
b.Fatal(err)
714714
}
715715
}
716716
}
717717

718718
func BenchmarkCompileAndExecuteComplexWithoutSandbox(b *testing.B) {
719-
buf, err := ioutil.ReadFile("template_tests/complex.tpl")
719+
buf, err := os.ReadFile("template_tests/complex.tpl")
720720
if err != nil {
721721
b.Fatal(err)
722722
}
@@ -731,7 +731,7 @@ func BenchmarkCompileAndExecuteComplexWithoutSandbox(b *testing.B) {
731731
b.Fatal(err)
732732
}
733733

734-
err = tpl.ExecuteWriterUnbuffered(tplContext, ioutil.Discard)
734+
err = tpl.ExecuteWriterUnbuffered(tplContext, io.Discard)
735735
if err != nil {
736736
b.Fatal(err)
737737
}
@@ -747,7 +747,7 @@ func BenchmarkParallelExecuteComplexWithoutSandbox(b *testing.B) {
747747
b.ResetTimer()
748748
b.RunParallel(func(pb *testing.PB) {
749749
for pb.Next() {
750-
err := tpl.ExecuteWriterUnbuffered(tplContext, ioutil.Discard)
750+
err := tpl.ExecuteWriterUnbuffered(tplContext, io.Discard)
751751
if err != nil {
752752
b.Fatal(err)
753753
}

‎pongo2_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package pongo2_test
33
import (
44
"errors"
55
"io"
6-
"io/ioutil"
6+
"os"
77
"path/filepath"
88
"testing"
99

@@ -122,7 +122,7 @@ func FuzzSimpleExecution(f *testing.F) {
122122
files = append(files, tpls...)
123123

124124
for _, tplPath := range files {
125-
buf, err := ioutil.ReadFile(tplPath)
125+
buf, err := os.ReadFile(tplPath)
126126
if err != nil {
127127
f.Fatalf("could not read file '%v': %v", tplPath, err)
128128
}

‎tags_ssi.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package pongo2
22

3-
import (
4-
"io/ioutil"
5-
)
3+
import "os"
64

75
type tagSSINode struct {
86
filename string
@@ -43,7 +41,7 @@ func tagSSIParser(doc *Parser, start *Token, arguments *Parser) (INodeTag, *Erro
4341
SSINode.template = temporaryTpl
4442
} else {
4543
// plaintext
46-
buf, err := ioutil.ReadFile(doc.template.set.resolveFilename(doc.template, fileToken.Val))
44+
buf, err := os.ReadFile(doc.template.set.resolveFilename(doc.template, fileToken.Val))
4745
if err != nil {
4846
return nil, (&Error{
4947
Sender: "tag:ssi",

‎template_loader.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"fmt"
77
"io"
88
"io/fs"
9-
"io/ioutil"
109
"log"
1110
"net/http"
1211
"os"
@@ -92,7 +91,7 @@ func (fs *LocalFilesystemLoader) SetBaseDir(path string) error {
9291

9392
// Get reads the path's content from your local filesystem.
9493
func (fs *LocalFilesystemLoader) Get(path string) (io.Reader, error) {
95-
buf, err := ioutil.ReadFile(path)
94+
buf, err := os.ReadFile(path)
9695
if err != nil {
9796
return nil, err
9897
}

‎template_sets.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"errors"
55
"fmt"
66
"io"
7-
"io/ioutil"
87
"log"
98
"os"
109
"sync"
@@ -219,7 +218,7 @@ func (set *TemplateSet) FromFile(filename string) (*Template, error) {
219218
OrigError: err,
220219
}
221220
}
222-
buf, err := ioutil.ReadAll(fd)
221+
buf, err := io.ReadAll(fd)
223222
if err != nil {
224223
return nil, &Error{
225224
Filename: filename,

‎variable.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,6 @@ func (p *Parser) parseVariableOrLiteral() (IEvaluator, *Error) {
583583
val: i,
584584
}
585585
return nr, nil
586-
587586
case TokenString:
588587
p.Consume()
589588
sr := &stringResolver{

0 commit comments

Comments
 (0)