forked from CGM_Public/pretix_original
Order import: handle mixed endings of last line (Z#23230806) (#6066)
* handle mixed line endings in import * formatting
This commit is contained in:
committed by
GitHub
parent
c037fd865b
commit
5c7104634e
@@ -70,6 +70,10 @@ def parse_csv(file, length=None, mode="strict", charset=None):
|
||||
except ImportError:
|
||||
charset = file.charset
|
||||
data = data.decode(charset or "utf-8", mode)
|
||||
|
||||
# remove stray linebreaks from the end of the file
|
||||
data = data.rstrip("\n")
|
||||
|
||||
# If the file was modified on a Mac, it only contains \r as line breaks
|
||||
if '\r' in data and '\n' not in data:
|
||||
data = data.replace('\r', '\n')
|
||||
|
||||
Reference in New Issue
Block a user