From 00199ae60e25c171b5e862b673943ab9e3e5455c Mon Sep 17 00:00:00 2001
From: bitraid <bitraid@protonmail.ch>
Date: Sun, 10 Jun 2018 02:24:47 +0300
Subject: [PATCH] Corrections to gen_versioninfo.py script

- Use main() function
- Call utils.change_cwd()
- Import info text
- Don't use fstrings
---
 scripts/dev/build_release.py   |  2 +-
 scripts/dev/gen_versioninfo.py | 64 +++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py
index e0bcf80d5..68d148747 100755
--- a/scripts/dev/build_release.py
+++ b/scripts/dev/build_release.py
@@ -234,7 +234,7 @@ def build_windows():
     artifacts = []
 
     utils.print_title("Updating VersionInfo file")
-    gen_versioninfo
+    gen_versioninfo.main()
 
     utils.print_title("Running pyinstaller 32bit")
     _maybe_remove(out_32)
diff --git a/scripts/dev/gen_versioninfo.py b/scripts/dev/gen_versioninfo.py
index afdb09fb2..29b86a59b 100644
--- a/scripts/dev/gen_versioninfo.py
+++ b/scripts/dev/gen_versioninfo.py
@@ -29,43 +29,43 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir,
                                 os.pardir))
 
 import qutebrowser
+from scripts import utils
 
-out_filename = 'misc/file_version_info.txt'
 
-filevers = qutebrowser.__version_info__ + (0,)
-prodvers = qutebrowser.__version_info__ + (0,)
-str_filevers = qutebrowser.__version__
-str_prodvers = qutebrowser.__version__
+def main():
+    utils.change_cwd()
+    out_filename = 'misc/file_version_info.txt'
 
-comment_text = """\
-A keyboard-focused browser with a minimal GUI.\
-"""
-copyright_text = """\
-© 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>\
-"""
-trademark_text = """\
-qutebrowser is free software under the GNU General Public License\
-"""
+    filevers = qutebrowser.__version_info__ + (0,)
+    prodvers = qutebrowser.__version_info__ + (0,)
+    str_filevers = qutebrowser.__version__
+    str_prodvers = qutebrowser.__version__
 
-ffi = vs.FixedFileInfo(filevers, prodvers)
+    comment_text = qutebrowser.__doc__
+    copyright_text = qutebrowser.__copyright__
+    trademark_text = "qutebrowser is free software under the GNU General Public License"
 
-kids = [vs.StringFileInfo(
-    [vs.StringTable('040904B0',
-                    [vs.StringStruct('Comments', f'{comment_text}'),
-                     vs.StringStruct('CompanyName', "qutebrowser.org"),
-                     vs.StringStruct('FileDescription', "qutebrowser"),
-                     vs.StringStruct('FileVersion', f'{str_filevers}'),
-                     vs.StringStruct('InternalName', "qutebrowser"),
-                     vs.StringStruct('LegalCopyright', f'{copyright_text}'),
-                     vs.StringStruct('LegalTrademarks', f'{trademark_text}'),
-                     vs.StringStruct('OriginalFilename', "qutebrowser.exe"),
-                     vs.StringStruct('ProductName', "qutebrowser"),
-                     vs.StringStruct('ProductVersion', f'{str_prodvers}')])]),
-    vs.VarFileInfo([vs.VarStruct('Translation', [1033, 1200])])]
+    ffi = vs.FixedFileInfo(filevers, prodvers)
 
-file_version_info = vs.VSVersionInfo(ffi, kids)
+    kids = [vs.StringFileInfo(
+        [vs.StringTable('040904B0',
+                        [vs.StringStruct('Comments', comment_text),
+                         vs.StringStruct('CompanyName', "qutebrowser.org"),
+                         vs.StringStruct('FileDescription', "qutebrowser"),
+                         vs.StringStruct('FileVersion', str_filevers),
+                         vs.StringStruct('InternalName', "qutebrowser"),
+                         vs.StringStruct('LegalCopyright', copyright_text),
+                         vs.StringStruct('LegalTrademarks', trademark_text),
+                         vs.StringStruct('OriginalFilename', "qutebrowser.exe"),
+                         vs.StringStruct('ProductName', "qutebrowser"),
+                         vs.StringStruct('ProductVersion', str_prodvers)])]),
+        vs.VarFileInfo([vs.VarStruct('Translation', [1033, 1200])])]
 
-with open(out_filename, 'w', encoding='utf-8') as f:
-    f.write(f'{file_version_info}')
+    file_version_info = vs.VSVersionInfo(ffi, kids)
 
-f.close()
+    with open(out_filename, 'w', encoding='utf-8') as f:
+        f.write(str(file_version_info))
+
+
+if __name__ == '__main__':
+    main()