Merge remote-tracking branch 'origin/master' into plone6

src/imio/helpers/security.py

@@ -14,7 +14,6 @@
 from random import sample
 from random import seed
 from six.moves import range
-from Testing import makerequest
 from time import time
 from zope.component import getMultiAdapter
 from zope.globalrequest import getRequest
@@ -82,14 +81,16 @@ 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:
         user = user.__of__(acl_users)
         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)