From 4dd593444ae185f063f9eae326ecafad6a81e294 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 22 Sep 2021 13:50:56 +0300 Subject: [PATCH] =?UTF-8?q?InstalledPackageInfo:=20=D0=B8=D1=81=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=88=D0=B8?= =?UTF-8?q?=D0=B1=D0=BA=D0=B0=20=D0=B4=D0=B5=D0=BA=D0=BE=D0=B4=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=83?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC?= =?UTF-8?q?=D0=B5=D1=82=D1=80=D0=BE=D0=B2=20=D0=B8=D0=B7=20environments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/calculate/lib/utils/portage.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/calculate/lib/utils/portage.py b/pym/calculate/lib/utils/portage.py index e87678a..d038066 100644 --- a/pym/calculate/lib/utils/portage.py +++ b/pym/calculate/lib/utils/portage.py @@ -1412,8 +1412,8 @@ class InstalledPackageInfo(): """ depend_pattern = 'declare (?:-x )?({0})="([^"]+)"' re_depend = re.compile(depend_pattern.format( - "|".join(EbuildInfo.support_keys)), re.DOTALL) - re_multispace = re.compile("\s+", re.DOTALL) + "|".join(EbuildInfo.support_keys)).encode('UTF-8'), re.DOTALL) + re_multispace = re.compile(b"\s+", re.DOTALL) def __init__(self, atom, pkg_dir): self.atom = atom @@ -1427,10 +1427,10 @@ class InstalledPackageInfo(): env_path = path.join(self._pkg_path, 'environment.bz2') if path.exists(env_path): with bz2.BZ2File(env_path, 'r') as f: - for r in self.re_depend.finditer(f.read().decode("UTF-8")): + for r in self.re_depend.finditer(f.read()): key, value = r.groups() - value = self.re_multispace.sub(" ", value) - info[key] = value.strip() + value = self.re_multispace.sub(b" ", value) + info[key.decode('UTF-8')] = value.strip().decode('UTF-8') rep_path = path.join(self._pkg_path, 'repository') info['repository'] = readFile(rep_path).strip() return EbuildInfo.prepare_use_flags(info)