io/ioutil is deprecated since Go 1.16

diff --git a/hr.go b/hr.go
index 687f4607e03c80e525ddfc656cab0606f8066605..045360d4891fb30a4ef4287e5fd7aa668649e0c3 100644 (file)
--- a/hr.go
+++ b/hr.go
@@ -21,7 +21,6 @@ import (
        "bytes"
        _ "embed"
        "html/template"
-       "io/ioutil"
        "log"
        "net/http"
        "os"
@@ -40,7 +39,7 @@ var (
 )
 
 func serveHRRoot(w http.ResponseWriter, r *http.Request) {
-       files, err := ioutil.ReadDir(Root)
+       files, err := os.ReadDir(Root)
        if err != nil {
                log.Println("error", r.RemoteAddr, "hr-root", err)
                http.Error(w, err.Error(), http.StatusInternalServerError)

diff --git a/integrity.go b/integrity.go
index cc6399ef51ee00bf87c7c2bd16148c54cef37db7..3a2d4e0c073e68ed34e5061f227bd0d21216fb74 100644 (file)
--- a/integrity.go
+++ b/integrity.go
@@ -24,7 +24,6 @@ import (
        "fmt"
        "hash"
        "io"
-       "io/ioutil"
        "log"
        "os"
        "path/filepath"
@@ -37,7 +36,7 @@ func checkFile(
        pkgName, fn, fnHash, hasherName string,
        hasher hash.Hash, digest []byte,
 ) bool {
-       expected, err := ioutil.ReadFile(fnHash)
+       expected, err := os.ReadFile(fnHash)
        if err != nil {
                log.Fatal(err)
        }
@@ -64,7 +63,7 @@ func checkFile(
 }
 
 func goodIntegrity() bool {
-       dirs, err := ioutil.ReadDir(Root)
+       dirs, err := os.ReadDir(Root)
        if err != nil {
                log.Fatal(err)
        }
@@ -75,7 +74,7 @@ func goodIntegrity() bool {
        isGood := true
        var pkgName string
        for _, dir := range dirs {
-               files, err := ioutil.ReadDir(filepath.Join(Root, dir.Name()))
+               files, err := os.ReadDir(filepath.Join(Root, dir.Name()))
                if err != nil {
                        log.Fatal(err)
                }

diff --git a/json.go b/json.go
index 4cb295e840c5a7b153cb83890bc7be1ce4e13607..00510a5a01b99dbaceaacefde1d3bdd5c3531df1 100644 (file)
--- a/json.go
+++ b/json.go
@@ -20,7 +20,6 @@ package main
 import (
        "bytes"
        "encoding/json"
-       "io/ioutil"
        "log"
        "net/http"
        "os"
@@ -35,7 +34,7 @@ func getMD(pkgName, version string) (*PkgMeta, []*PkgReleaseInfo, error) {
        if err != nil {
                return nil, nil, err
        }
-       md, err := ioutil.ReadFile(filepath.Join(Root, pkgName, MDFile))
+       md, err := os.ReadFile(filepath.Join(Root, pkgName, MDFile))
        if err != nil {
                if !os.IsNotExist(err) {
                        return nil, nil, err

diff --git a/list.go b/list.go
index 356cd6bf01874f5aaf687028d3dfd556dc56db76..8567877d336b49a3c51ffceb63ef942399d086da 100644 (file)
--- a/list.go
+++ b/list.go
@@ -25,7 +25,6 @@ import (
        "fmt"
        "html/template"
        "io/fs"
-       "io/ioutil"
        "log"
        "net/http"
        "os"
@@ -50,7 +49,7 @@ var (
 )
 
 func listRoot(w http.ResponseWriter, r *http.Request) {
-       files, err := ioutil.ReadDir(Root)
+       files, err := os.ReadDir(Root)
        if err != nil {
                log.Println("error", r.RemoteAddr, "root", err)
                http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -147,7 +146,7 @@ func listDir(pkgName string, doSize bool) (int64, []*PkgReleaseInfo, error) {
                                continue
                        }
                        delete(files, fn)
-                       digest, err := ioutil.ReadFile(filepath.Join(dirPath, fn))
+                       digest, err := os.ReadFile(filepath.Join(dirPath, fn))
                        if err != nil {
                                return 0, nil, err
                        }

diff --git a/refresh.go b/refresh.go
index 607ef4c50281bea7d5e9fd8bd114a92a1dd056fa..ea3af19c049d4738273a63f9189267577914e5f7 100644 (file)
--- a/refresh.go
+++ b/refresh.go
@@ -28,7 +28,6 @@ import (
        "errors"
        "hash"
        "io"
-       "io/ioutil"
        "log"
        "net/http"
        "net/url"
@@ -115,7 +114,7 @@ func refreshDir(
                        http.Error(w, "PyPI has non 200 status code", http.StatusBadGateway)
                        return false
                }
-               body, err := ioutil.ReadAll(resp.Body)
+               body, err := io.ReadAll(resp.Body)
                if err != nil {
                        resp.Body.Close()
                        log.Println("error", r.RemoteAddr, "refresh-json", pkgName, err)
@@ -240,7 +239,7 @@ func refreshDir(
                        return false
                }
                path := filepath.Join(dirPath, MDFile)
-               existing, err := ioutil.ReadFile(path)
+               existing, err := os.ReadFile(path)
                if err != nil || bytes.Compare(existing, buf.Bytes()) != 0 {
                        if err = WriteFileSync(dirPath, path, buf.Bytes(), now); err != nil {
                                log.Println("error", r.RemoteAddr, "refresh-json", path, err)
@@ -284,7 +283,7 @@ func refreshDir(
                http.Error(w, "PyPI has non 200 status code", http.StatusBadGateway)
                return false
        }
-       body, err := ioutil.ReadAll(resp.Body)
+       body, err := io.ReadAll(resp.Body)
        resp.Body.Close()
        if err != nil {
                log.Println("error", r.RemoteAddr, "refresh", pkgName, err)
@@ -434,7 +433,7 @@ func refreshDir(
                                http.Error(w, "digest mismatch", http.StatusBadGateway)
                                return false
                        }
-                       if digestStored, err := ioutil.ReadFile(path + "." + hashAlgo); err == nil &&
+                       if digestStored, err := os.ReadFile(path + "." + hashAlgo); err == nil &&
                                bytes.Compare(digest, digestStored) != 0 {
                                err = errors.New("stored digest mismatch")
                                log.Println("error", r.RemoteAddr, "pypi", filename, err)
@@ -531,7 +530,7 @@ func refreshDir(
                                resp.Body.Close()
                                goto GPGSigSkip
                        }
-                       sig, err := ioutil.ReadAll(resp.Body)
+                       sig, err := io.ReadAll(resp.Body)
                        resp.Body.Close()
                        if err != nil {
                                goto GPGSigSkip

diff --git a/upload.go b/upload.go
index aec2008849f534241ad7ce3850627663cb265973..5ab1048c3cefd07b675493983d5d70c802bec80a 100644 (file)
--- a/upload.go
+++ b/upload.go
@@ -24,7 +24,6 @@ import (
        "crypto/sha256"
        "encoding/hex"
        "io"
-       "io/ioutil"
        "log"
        "net/http"
        "os"
@@ -215,7 +214,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
                        http.Error(w, err.Error(), http.StatusInternalServerError)
                        return
                }
-               sig, err := ioutil.ReadAll(src)
+               sig, err := io.ReadAll(src)
                src.Close()
                if err != nil {
                        log.Println("error", r.RemoteAddr, filename, err)