fixup! more generic zope4py3 fixes

bt5/erp5_authentication_policy/TestTemplateItem/portal_components/test.erp5.testAuthenticationPolicy.py

@@ -237,13 +237,13 @@ class TestAuthenticationPolicy(ERP5TypeTestCase):
     self.tic()
 
     # password change date should be saved as well hashed old password value
-    old_password = login.getPassword().decode()
+    old_password = login.getPassword()
     self.assertSameSet([old_password], [x.getPassword() for x in self._getPasswordEventList(login)])
 
     # .. test one more time to check history of password is saved in a list
     login.setPassword('123456789')
     self.tic()
-    old_password1 = login.getPassword().decode()
+    old_password1 = login.getPassword()
 
     # password change date should be saved as well hashed old password value
     self.assertSameSet([old_password1, old_password], [x.getPassword() for x in self._getPasswordEventList(login)])
@@ -251,29 +251,29 @@ class TestAuthenticationPolicy(ERP5TypeTestCase):
     # other methods (_setPassword)...
     login._setPassword('123456789-1')
     self.tic()
-    old_password2 = login.getPassword().decode()
+    old_password2 = login.getPassword()
     self.assertSameSet([old_password2, old_password1, old_password], \
                      [x.getPassword() for x in self._getPasswordEventList(login)])
 
     # other methods (_forceSetPassword)...
     login._forceSetPassword('123456789-2')
     self.tic()
-    old_password3 = login.getPassword().decode()
+    old_password3 = login.getPassword()
     self.assertSameSet([old_password3, old_password2, old_password1, old_password], \
                      [x.getPassword() for x in self._getPasswordEventList(login)])
 
 
     # other methods (setEncodedPassword)...
-    login.setEncodedPassword(b'123456789-3')
+    login.setEncodedPassword('123456789-3')
     self.tic()
-    old_password4 = login.getPassword().decode()
+    old_password4 = login.getPassword()
     self.assertSameSet([old_password4, old_password3, old_password2, old_password1, old_password], \
                      [x.getPassword() for x in self._getPasswordEventList(login)])
 
     # other methods (edit)...
     login.edit(password = '123456789-4')
     self.tic()
-    old_password5 = login.getPassword().decode()
+    old_password5 = login.getPassword()
     self.assertSameSet([old_password5, old_password4, old_password3, old_password2, old_password1, old_password], \
                      [x.getPassword() for x in self._getPasswordEventList(login)])
 

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Base.py

@@ -2079,9 +2079,11 @@ class TestImage(ERP5TypeTestCase):
   """
   def makeImageFileUpload(self, filename):
     import Products.ERP5.tests
-    return FileUpload(
+    fu = FileUpload(
             os.path.join(os.path.dirname(Products.ERP5.tests.__file__),
             'test_data', 'images', filename))
+    self.addCleanup(fu.close)
+    return fu
 
   def test_CreateImage(self):
     # We can add Images inside Persons and Organisation