modernized reading/writing code

This commit is contained in:
justvanrossum 2017-11-24 17:46:31 +01:00
parent 0eb40c6346
commit e0c275896b

View File

@ -337,22 +337,13 @@ class AFM(object):
def readlines(path): def readlines(path):
f = open(path, 'rb') with open(path, "r", encoding="ascii") as f:
data = f.read().decode("ascii") data = f.read()
f.close() return data.splitlines()
# read any text file, regardless whether it's formatted for Mac, Unix or Dos
sep = ""
if '\r' in data:
sep = sep + '\r' # mac or dos
if '\n' in data:
sep = sep + '\n' # unix or dos
return data.split(sep)
def writelines(path, lines, sep='\r'): def writelines(path, lines, sep='\r'):
f = open(path, 'wb') with open(path, "w", encoding="ascii", newline=sep) as f:
for line in lines: f.write("\n".join(lines) + "\n")
f.write((line + sep).encode("ascii"))
f.close()
if __name__ == "__main__": if __name__ == "__main__":