Skip to content

Commit 52d9efe

Browse files
authored
Merge pull request #73 from mbenson/dep
migrate from deprecated ioutil dependency
2 parents c9a06e8 + 5478cd7 commit 52d9efe

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

load.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package properties
66

77
import (
88
"fmt"
9-
"io/ioutil"
9+
"io"
1010
"net/http"
1111
"os"
1212
"strings"
@@ -91,7 +91,7 @@ func (l *Loader) LoadAll(names []string) (*Properties, error) {
9191
// If IgnoreMissing is true then a missing file will not be
9292
// reported as error.
9393
func (l *Loader) LoadFile(filename string) (*Properties, error) {
94-
data, err := ioutil.ReadFile(filename)
94+
data, err := os.ReadFile(filename)
9595
if err != nil {
9696
if l.IgnoreMissing && os.IsNotExist(err) {
9797
LogPrintf("properties: %s not found. skipping", filename)
@@ -126,7 +126,7 @@ func (l *Loader) LoadURL(url string) (*Properties, error) {
126126
return nil, fmt.Errorf("properties: %s returned %d", url, resp.StatusCode)
127127
}
128128

129-
body, err := ioutil.ReadAll(resp.Body)
129+
body, err := io.ReadAll(resp.Body)
130130
if err != nil {
131131
return nil, fmt.Errorf("properties: %s error reading response. %s", url, err)
132132
}

load_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package properties
66

77
import (
88
"fmt"
9-
"io/ioutil"
109
"net/http"
1110
"net/http/httptest"
1211
"os"
@@ -183,9 +182,9 @@ func (tf *tempFiles) makeFile(data string) string {
183182
}
184183

185184
func (tf *tempFiles) makeFilePrefix(prefix, data string) string {
186-
f, err := ioutil.TempFile("", prefix)
185+
f, err := os.CreateTemp("", prefix)
187186
if err != nil {
188-
panic("ioutil.TempFile: " + err.Error())
187+
panic("os.TempFile: " + err.Error())
189188
}
190189

191190
// remember the temp file so that we can remove it later

0 commit comments

Comments
 (0)