From fd39e6dc6a183a2779d22f4e63f9be6d716db794 Mon Sep 17 00:00:00 2001
From: Richard Mahn <richmahn@users.noreply.github.com>
Date: Thu, 5 Aug 2021 10:56:11 -0600
Subject: [PATCH] Fixes #16557 - duplicate csv import (#16631)
Remove the unnecessary duplicate package import for `encoding/csv` in `modules/csv/csv.go`
Fix #16557
---
modules/csv/csv.go | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/modules/csv/csv.go b/modules/csv/csv.go
index bf433f77d2..35486edd88 100644
--- a/modules/csv/csv.go
+++ b/modules/csv/csv.go
@@ -6,7 +6,6 @@ package csv
import (
"bytes"
- "encoding/csv"
stdcsv "encoding/csv"
"errors"
"io"
@@ -97,9 +96,9 @@ func scoreDelimiter(lines []string, delim rune) float64 {
// FormatError converts csv errors into readable messages.
func FormatError(err error, locale translation.Locale) (string, error) {
- var perr *csv.ParseError
+ var perr *stdcsv.ParseError
if errors.As(err, &perr) {
- if perr.Err == csv.ErrFieldCount {
+ if perr.Err == stdcsv.ErrFieldCount {
return locale.Tr("repo.error.csv.invalid_field_count", perr.Line), nil
}
return locale.Tr("repo.error.csv.unexpected", perr.Line, perr.Column), nil