From d97dcac0e1026a24de0245902fecfc623266e26b Mon Sep 17 00:00:00 2001 From: Anoop S <40671157+anoop142@users.noreply.github.com> Date: Thu, 9 Nov 2023 20:56:27 +0530 Subject: [PATCH] remove deprecated io/ioutil (#48) * ioutil is deprecated since go 1.16 * go version in go.mod is 1.16, so removing won't affect us --- govarnam/govarnam_ml_test.go | 3 +-- govarnam/govarnam_test.go | 3 +-- govarnam/learn.go | 5 ++--- govarnamgo/govarnamgo_test.go | 3 +-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/govarnam/govarnam_ml_test.go b/govarnam/govarnam_ml_test.go index 5029d76..ae32a7b 100644 --- a/govarnam/govarnam_ml_test.go +++ b/govarnam/govarnam_ml_test.go @@ -2,7 +2,6 @@ package govarnam import ( "context" - "io/ioutil" "log" "path" "strings" @@ -377,7 +376,7 @@ func TestMLExportAndImport(t *testing.T) { varnam.Export(exportFileIntendedPath, 300) // read the whole file at once - b, err := ioutil.ReadFile(exportFilePath) + b, err := os.ReadFile(exportFilePath) if err != nil { panic(err) } diff --git a/govarnam/govarnam_test.go b/govarnam/govarnam_test.go index d23e053..06b6b67 100644 --- a/govarnam/govarnam_test.go +++ b/govarnam/govarnam_test.go @@ -1,7 +1,6 @@ package govarnam import ( - "io/ioutil" "log" "os" "path" @@ -104,7 +103,7 @@ func TestMain(m *testing.M) { log.Fatal(err) } - testTempDir, err = ioutil.TempDir("", "govarnam_test") + testTempDir, err = os.TempDir("", "govarnam_test") checkError(err) for _, schemeDetail := range schemeDetails { diff --git a/govarnam/learn.go b/govarnam/learn.go index fe86c7a..33b4f55 100644 --- a/govarnam/learn.go +++ b/govarnam/learn.go @@ -12,7 +12,6 @@ import ( sql "database/sql" "encoding/json" "fmt" - "io/ioutil" "log" "math" "os" @@ -624,7 +623,7 @@ func (varnam *Varnam) Export(filePath string, wordsPerFile int) error { jsonData, err := json.Marshal(output) filePathWithPageNumber := filePath + "-" + fmt.Sprint(page) + ".vlf" - err = ioutil.WriteFile(filePathWithPageNumber, jsonData, 0644) + err = os.WriteFile(filePathWithPageNumber, jsonData, 0644) if err != nil { return err } @@ -642,7 +641,7 @@ func (varnam *Varnam) Import(filePath string) error { } // TODO better reading of JSON. This loads entire file into memory - fileContent, _ := ioutil.ReadFile(filePath) + fileContent, _ := os.ReadFile(filePath) var dbData exportFormat diff --git a/govarnamgo/govarnamgo_test.go b/govarnamgo/govarnamgo_test.go index 1886507..f75e8f6 100644 --- a/govarnamgo/govarnamgo_test.go +++ b/govarnamgo/govarnamgo_test.go @@ -1,7 +1,6 @@ package govarnamgo import ( - "io/ioutil" "log" "os" "os/exec" @@ -68,7 +67,7 @@ func tearDown() { func TestMain(m *testing.M) { var err error - testTempDir, err = ioutil.TempDir("", "govarnam_test") + testTempDir, err = os.TempDir("", "govarnam_test") checkError(err) setUp("ml")