From a1a6817e4dd52b06c02eeac40ef0192eb86ccb09 Mon Sep 17 00:00:00 2001 From: Aron Budea Date: Thu, 17 Aug 2023 02:56:54 +0200 Subject: unocommands.py: Treat JS/TS files as UTF-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise eg. non-ASCII shortcuts appearing in files can cause failures like this. Traceback (most recent call last): File ".../rpmbuild/BUILD/coolwsd-23.05.2.2snapshot/scripts/unocommands.py", line 454, in toolbarCommands = extractToolbarCommands(onlineDir) File ".../rpmbuild/BUILD/coolwsd-23.05.2.2snapshot/scripts/unocommands.py", line 163, in extractToolbarCommands for line in f: File "/usr/lib64/python3.6/encodings/ascii.py", line 26, in decode return codecs.ascii_decode(input, self.errors)[0] Encountered after 1a2500c8d31f12a8e23c648a0afb208e3d09bb05. This is not ASCII in browser/src/control/Control.NotebookbarWriter.js: `'accessibility': { focusBack: true, combination: 'AI', de: 'ÖI' } Signed-off-by: Aron Budea Change-Id: I72aac2809530c14b9440f73e5072db17770f438a --- scripts/unocommands.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'scripts') diff --git a/scripts/unocommands.py b/scripts/unocommands.py index bf0297ef7e..727e64c41d 100755 --- a/scripts/unocommands.py +++ b/scripts/unocommands.py @@ -75,7 +75,7 @@ def extractMenuCommands(path): commands = [] # extract from the menu specifications - f = open(path + '/browser/src/control/Control.Menubar.js', 'r') + f = open(path + '/browser/src/control/Control.Menubar.js', 'r', encoding='utf-8') for line in f: if line.find("uno:") >= 0 and line.find("name:") < 0: commands += commandFromMenuLine(line) @@ -92,7 +92,7 @@ def extractContextCommands(path): commands = [] # extract from the comments whitelist - f = open(path + '/browser/src/control/Control.ContextMenu.js', 'r') + f = open(path + '/browser/src/control/Control.ContextMenu.js', 'r', encoding='utf-8') readingCommands = False for line in f: if line.find('UNOCOMMANDS_EXTRACT_START') >= 0: @@ -102,17 +102,17 @@ def extractContextCommands(path): elif readingCommands: commands += commandsFromLine(line) - f = open(path + '/browser/src/control/Control.ColumnHeader.ts', 'r') + f = open(path + '/browser/src/control/Control.ColumnHeader.ts', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.RowHeader.ts', 'r') + f = open(path + '/browser/src/control/Control.RowHeader.ts', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.Tabs.js', 'r') + f = open(path + '/browser/src/control/Control.Tabs.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) @@ -128,74 +128,74 @@ def extractToolbarCommands(path): commands = [] # extract from the toolbars - f = open(path + '/browser/src/control/Control.Toolbar.js', 'r') + f = open(path + '/browser/src/control/Control.Toolbar.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.MobileBottomBar.js', 'r') + f = open(path + '/browser/src/control/Control.MobileBottomBar.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.MobileTopBar.js', 'r') + f = open(path + '/browser/src/control/Control.MobileTopBar.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.MobileWizardBuilder.js', 'r') + f = open(path + '/browser/src/control/Control.MobileWizardBuilder.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) f = open(path + - '/browser/src/control/Control.NotebookbarBuilder.js', 'r') + '/browser/src/control/Control.NotebookbarBuilder.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.Notebookbar.js', 'r') + f = open(path + '/browser/src/control/Control.Notebookbar.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.NotebookbarWriter.js', 'r') + f = open(path + '/browser/src/control/Control.NotebookbarWriter.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.NotebookbarCalc.js', 'r') + f = open(path + '/browser/src/control/Control.NotebookbarCalc.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) f = open(path + - '/browser/src/control/Control.NotebookbarImpress.js', 'r') + '/browser/src/control/Control.NotebookbarImpress.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.NotebookbarDraw.js', 'r') + f = open(path + '/browser/src/control/Control.NotebookbarDraw.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.PresentationBar.js', 'r') + f = open(path + '/browser/src/control/Control.PresentationBar.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.SearchBar.js', 'r') + f = open(path + '/browser/src/control/Control.SearchBar.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.StatusBar.js', 'r') + f = open(path + '/browser/src/control/Control.StatusBar.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) - f = open(path + '/browser/src/control/Control.TopToolbar.js', 'r') + f = open(path + '/browser/src/control/Control.TopToolbar.js', 'r', encoding='utf-8') for line in f: if line.find("_UNO(") >= 0: commands += commandFromMenuLine(line) -- cgit