Browse Source

Fixes #16557 - duplicate csv import (#16631)

Remove the unnecessary duplicate package import for `encoding/csv` in `modules/csv/csv.go`

Fix #16557
tags/v1.16.0-rc1
Richard Mahn 2 years ago
parent
commit
fd39e6dc6a
No account linked to committer's email address
1 changed files with 2 additions and 3 deletions
  1. 2
    3
      modules/csv/csv.go

+ 2
- 3
modules/csv/csv.go View File

@@ -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

Loading…
Cancel
Save