From 751cee16864784c8ff3ec2a0c74cb0958012a987 Mon Sep 17 00:00:00 2001 From: Papoteur Date: Sun, 1 Nov 2015 09:40:16 +0100 Subject: Reading and writing spec file in utf-8 encoding in log.py --- MgaRepo/log.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'MgaRepo') diff --git a/MgaRepo/log.py b/MgaRepo/log.py index 2622f72..96be56d 100644 --- a/MgaRepo/log.py +++ b/MgaRepo/log.py @@ -607,9 +607,8 @@ def get_changelog(pkgdirurl, another=None, svn=True, rev=None, size=None, def specfile_svn2rpm(pkgdirurl, specfile, rev=None, size=None, submit=False, sort=False, template=None, macros=[], exported=None): - fi = open(specfile) - spec, oldchlog = split_spec_changelog(fi) - fi.close() + with open(specfile, encoding = 'utf-8') as fi: + spec, oldchlog = split_spec_changelog(fi) another = None if config.getbool("log", "merge-spec", False): another = oldchlog @@ -617,12 +616,12 @@ def specfile_svn2rpm(pkgdirurl, specfile, rev=None, size=None, chlog = get_changelog(pkgdirurl, another=another, rev=rev, size=size, submit=submit, sort=sort, template=template, macros=macros, exported=exported, oldlog=True) - fo = open(specfile, "w") - fo.writelines(spec) - fo.write("\n\n%changelog\n") - fo.writelines(chlog) - fo.close() - + print(spec) + with open(specfile, "w", encoding='utf-8') as fo: + fo.writelines(spec) + fo.write("\n\n%changelog\n") + fo.writelines(chlog) + if __name__ == "__main__": l = svn2rpm(sys.argv[1]) print(l) -- cgit v1.2.1