opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Binary variant of convert_newlines.

Browse Source
This commit is contained in:
John Chilton
2019-05-17 15:41:13 -04:00
parent 0e707f2901
commit 6887398a49
1 changed files with 4 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/datatypes/sniff.py
+4 -47
View File
@@ -110,53 +110,10 @@ def convert_newlines(fname, in_place=True, tmp_dir=None, tmp_prefix="gxupload",
"""
fd, temp_name = tempfile.mkstemp(prefix=tmp_prefix, dir=tmp_dir)
i = 0
try:
with io.open(fd, mode="wt", encoding='utf-8') as fp:
with io.open(fname, encoding='utf-8') as fi:
partial_line = False
while True:
line = fi.readline(block_size)
if not line:
if partial_line:
fp.write(u"\n")
i += 1
break
if line[-1] == u"\n":
partial_line = False
fp.write(line)
i += 1
continue
# We have a block... maybe at the end of the file.
partial_line = True
fp.write(line)
except UnicodeDecodeError:
fd, temp_name = tempfile.mkstemp(prefix=tmp_prefix, dir=tmp_dir)
i = 0
with io.open(fd, mode="wb") as fp:
with io.open(fname, mode="rb") as fi:
partial_line = False
while True:
line = fi.readline(block_size)
if not line:
if partial_line:
fp.write(b"\n")
i += 1
break
strip_line = line.rstrip(b"\r\n")
if len(strip_line) != len(line):
partial_line = False
fp.write(strip_line)
fp.write(b"\n")
i += 1
continue
# We have a block... maybe at the end of the file.
partial_line = True
fp.write(line)
with io.open(fd, mode="wb") as fp:
with io.open(fname, mode="rb") as fi:
for i, line in enumerate(fi):
fp.write(b"%s\n" % line.rstrip(b"\r\n"))
if in_place:
shutil.move(temp_name, fname)
# Return number of lines in file.