From 70bc63ebf9bd599861feaba312b71b4a99ff8c71 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 6 Sep 2011 23:26:08 +0200 Subject: [PATCH] [entropy.client] python 3.x fixes --- libraries/entropy/client/interfaces/methods.py | 2 +- libraries/entropy/client/interfaces/trigger.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entropy/client/interfaces/methods.py b/libraries/entropy/client/interfaces/methods.py index 39a11aeb4..aae699a08 100644 --- a/libraries/entropy/client/interfaces/methods.py +++ b/libraries/entropy/client/interfaces/methods.py @@ -162,7 +162,7 @@ class RepositoryMixin: @type mask_clear: bool """ repo_cache = getattr(self, "_repodb_cache", {}) - for item, val in repo_cache.items(): + for item, val in list(repo_cache.items()): # list() -> python3 support repository_id, root = item # in-memory repositories cannot be closed # otherwise everything will be lost, to diff --git a/libraries/entropy/client/interfaces/trigger.py b/libraries/entropy/client/interfaces/trigger.py index 03b5f18a9..59457768e 100644 --- a/libraries/entropy/client/interfaces/trigger.py +++ b/libraries/entropy/client/interfaces/trigger.py @@ -444,7 +444,7 @@ class Trigger: entropy_sh = const_convert_to_rawstring(entropy_sh) tmp_fd, tmp_path = tempfile.mkstemp() with os.fdopen(tmp_fd, "ab+") as tr_f: - tr_f.write(self._pkgdata['trigger']) + tr_f.write(const_convert_to_rawstring(self._pkgdata['trigger'])) tr_f.flush() tr_f.seek(0) interpreter = tr_f.read(128)