From b5993c56169e075332d4c4ad7060e809c4661da7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=94=D0=B7=D1=8E=D0=B1=D0=B5?= =?UTF-8?q?=D0=BD=D0=BA=D0=BE?= Date: Thu, 19 Aug 2021 12:34:27 +0300 Subject: [PATCH] fixed encoding in timezone variables --- pym/install/variables/locale.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/install/variables/locale.py b/pym/install/variables/locale.py index e61ef31..90591d0 100644 --- a/pym/install/variables/locale.py +++ b/pym/install/variables/locale.py @@ -61,7 +61,7 @@ class VariableOsInstallLinguas(LocaleVariable): emerge_config = self.Get('cl_emerge_config') if emerge_config and "LINGUAS" in emerge_config: - return emerge_config['LINGUAS'].encode('UTF-8') + return emerge_config['LINGUAS'] infocommand = ['emerge', '--info'] defaultLinguas = "bg en de es fr it pl pt_BR nl ru uk" @@ -333,7 +333,7 @@ class VariableOsInstallClockTimezone(LocaleVariable): try: lang = self.Get(self.locale_varname).split('_')[1] - nativeTZ = [x.encode('utf-8') for x in country_timezones[lang]] + nativeTZ = [x for x in country_timezones[lang]] source = nativeTZ + ["---"] + \ sorted([x for x in source if not x in nativeTZ], key=sortkey) except (KeyError, IndexError) as e: