From 115f493676a14a9382fad99090416bbc7629474b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 7 Aug 2022 14:43:06 +0200 Subject: [PATCH] [bootloader] Repair Python 3.6 compatibility Argument *text* is an addition in 3.7, while the Calamares 3.3 branch supports Python 3.6 and later. Use the 'backwards compatibility' name of the parameter, *universal_newlines*. Cherry-picked from 33961ff6f (in the 3.2 branch, though, Python 3.3 is supported). --- src/modules/bootloader/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index afb312051..c10d8bf2e 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -471,7 +471,7 @@ def efi_boot_next(): """ boot_mgr = libcalamares.job.configuration["efiBootMgr"] boot_entry = None - efi_bootvars = subprocess.check_output([boot_mgr], text=True) + efi_bootvars = subprocess.check_output([boot_mgr], universal_newlines=True) for line in efi_bootvars.split('\n'): if not line: continue