From bbc8bed39c6af075ef7ab8219ef470e309e72f77 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sat, 22 Feb 2020 17:59:25 +0100 Subject: [PATCH] move temp_plugin to account --- python/src/deltachat/account.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/python/src/deltachat/account.py b/python/src/deltachat/account.py index bed2a6d50..cec7a438c 100644 --- a/python/src/deltachat/account.py +++ b/python/src/deltachat/account.py @@ -383,7 +383,7 @@ class Account(object): return export_files[0] def _export(self, path, imex_cmd): - with temp_plugin(self.plugin_manager, ImexTracker()) as imex_tracker: + with self.temp_plugin(ImexTracker()) as imex_tracker: lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), ffi.NULL) if not self._threads.is_started(): lib.dc_perform_imap_jobs(self._dc_context) @@ -405,7 +405,7 @@ class Account(object): self._import(path, imex_cmd=12) def _import(self, path, imex_cmd): - with temp_plugin(self.plugin_manager, ImexTracker()) as imex_tracker: + with self.temp_plugin(ImexTracker()) as imex_tracker: lib.dc_imex(self._dc_context, imex_cmd, as_dc_charpointer(path), ffi.NULL) if not self._threads.is_started(): lib.dc_perform_imap_jobs(self._dc_context) @@ -528,12 +528,12 @@ class Account(object): if dc_res == 0: raise ValueError("no chat is streaming locations") - -@contextmanager -def temp_plugin(plugin_manager, plugin): - plugin_manager.register(plugin) - yield plugin - plugin_manager.unregister(plugin) + @contextmanager + def temp_plugin(self, plugin): + """ run a code block with the given plugin temporarily registered. """ + self.plugin_manager.register(plugin) + yield plugin + self.plugin_manager.unregister(plugin) class ImexTracker: