diff --git a/python/damask/_config.py b/python/damask/_config.py index 7adcee9df..671f203a8 100644 --- a/python/damask/_config.py +++ b/python/damask/_config.py @@ -144,7 +144,7 @@ class Config(dict): Configuration from file. """ - fhandle = open(Path(fname).expanduser()) if isinstance(fname, (str, Path)) else \ + fhandle = open(Path(fname).expanduser(),newline='\n') if isinstance(fname, (str, Path)) else \ fname return cls(yaml.safe_load(fhandle)) diff --git a/python/damask/_result.py b/python/damask/_result.py index 227685b59..0cc2008aa 100644 --- a/python/damask/_result.py +++ b/python/damask/_result.py @@ -1803,7 +1803,7 @@ class Result: if type(obj) == h5py.Dataset and _match(output,[name]): d = obj.attrs['description'] if h5py3 else obj.attrs['description'].decode() if not Path(name).exists() or overwrite: - with open(name,'w') as f_out: f_out.write(obj[0].decode()) + with open(name,'w',newline='\n') as f_out: f_out.write(obj[0].decode()) print(f'Exported {d} to "{name}".') else: print(f'"{name}" exists, {d} not exported.') diff --git a/python/damask/_table.py b/python/damask/_table.py index 55342bd32..d8f4d5c6b 100644 --- a/python/damask/_table.py +++ b/python/damask/_table.py @@ -260,7 +260,7 @@ class Table: Table data from file. """ - f = open(Path(fname).expanduser()) if isinstance(fname, (str, Path)) else fname + f = open(Path(fname).expanduser(),newline='\n') if isinstance(fname, (str, Path)) else fname f.seek(0) comments = [] @@ -281,7 +281,7 @@ class Table: else: shapes[label] = (1,) - data = pd.read_csv(f,names=list(range(len(labels))),sep=r'\s+') + data = pd.read_csv(f,names=list(range(len(labels))),sep=r'\s+',lineterminator='\n') return Table(shapes,data,comments) @@ -312,7 +312,7 @@ class Table: Table data from file. """ - f = open(fname) if isinstance(fname, (str, Path)) else fname + f = open(Path(fname).expanduser(),newline='\n') if isinstance(fname, (str, Path)) else fname f.seek(0) content = f.readlines() @@ -597,4 +597,4 @@ class Table: f = open(Path(fname).expanduser(),'w',newline='\n') if isinstance(fname, (str, Path)) else fname f.write('\n'.join([f'# {c}' for c in self.comments] + [' '.join(labels)])+('\n' if labels else '')) - self.data.to_csv(f,sep=' ',na_rep='nan',index=False,header=False) + self.data.to_csv(f,sep=' ',na_rep='nan',index=False,header=False,line_terminator='\n')