From 27e8f2f8feae36b043880d1a514a18e8a6e2b6de Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 23 Jun 2020 15:55:03 +0200 Subject: [PATCH] user_import: do not use contextlib.nested() (#44356) --- src/authentic2/manager/user_import.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/authentic2/manager/user_import.py b/src/authentic2/manager/user_import.py index 8f12c278..f3edbe6e 100644 --- a/src/authentic2/manager/user_import.py +++ b/src/authentic2/manager/user_import.py @@ -201,12 +201,11 @@ class Report(object): @contextlib.contextmanager def publik_provisionning(): - managers = [] if 'hobo.agent.authentic2' in settings.INSTALLED_APPS and not simulate: # provisionning is initialied in hobo.agent.authentic2.provisionning.apps from hobo.agent.authentic2.provisionning import provisionning as engine - managers.append(engine) - with contextlib.nested(*managers): + + with engine: yield None # prevent the provisionning thread from outliving the import thread engine.wait() -- 2.26.2