From adb1d70a926245300ed665b02235a9b7a0f9f103 Mon Sep 17 00:00:00 2001
From: Gauthier Bastien <gauthier.bastien@imio.be>
Date: Wed, 3 Jan 2024 09:37:34 +0100
Subject: [PATCH] Adapted security.setup_app to import makerequest into it to
 avoid Data.fs weird init problem

---
 src/imio/helpers/security.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/imio/helpers/security.py b/src/imio/helpers/security.py
index 3e16710..0fe3c3f 100644
--- a/src/imio/helpers/security.py
+++ b/src/imio/helpers/security.py
@@ -13,7 +13,6 @@
 from random import choice
 from random import sample
 from random import seed
-from Testing import makerequest
 from time import time
 from zope.component import getMultiAdapter
 from zope.globalrequest import getRequest
@@ -83,6 +82,8 @@ def generate_password(length=10, digits=3, upper=2, lower=1, special=1, readable
 
 
 def setup_app(app, username='admin', logger=None):
+    # import here to avoid weird init making Data.fs not useable
+    from Testing.makerequest import makerequest
     acl_users = app.acl_users
     user = acl_users.getUser(username)
     if user:
@@ -90,7 +91,7 @@ def setup_app(app, username='admin', logger=None):
         newSecurityManager(None, user)
     elif logger:
         logger.error("Cannot find zope user '%s'" % username)
-    app = makerequest.makerequest(app)
+    app = makerequest(app)
     # support plone.subrequest
     app.REQUEST['PARENTS'] = [app]
     setRequest(app.REQUEST)