Merge branch 'bradl/use-utf8-and-linux-eol' into 'master'

add gitattribute to force LF line endings and set cleanyaml.py to read/write as utf8 always

See merge request jrmiller82/pathfinder-2-sqlite!48
merge-requests/52/head
James Miller 2020-05-07 23:11:18 +00:00
commit 37aad85387
2 changed files with 11 additions and 2 deletions

9
.gitattributes vendored 100644
View File

@ -0,0 +1,9 @@
*.yaml text eol=lf
*.py text eol=lf
*.md text eol=lf
*.sql text eol=lf
*.bat text eol=lf
*.sh text eol=lf
*.json text eol=lf
*.txt text eol=lf
*.csv text eol=lf

View File

@ -22,7 +22,7 @@ def main():
for x in yfiles:
print("Doing: {}".format(x))
with open(x, 'r') as r:
with open(x, 'r', encoding="utf8") as r:
data = yaml.full_load(r)
if x == "feats.yaml":
for i in data['feat']:
@ -44,7 +44,7 @@ def main():
final = yaml.safe_dump(data, allow_unicode=True)
with open(x, 'w') as f:
with open(x, 'w', encoding="utf8") as f:
f.write(final)
print("\tDone.")