Fix ResourceWarnings for unclosed files and fix DeprecationWarnings.

news/4090.bugfix

@@ -0,0 +1 @@
+Fix ResourceWarnings for unclosed files and fix DeprecationWarnings. [maurits]

src/Products/PlonePAS/interfaces/plugins.py

@@ -42,7 +42,7 @@ def getRolesInContext(user, object):
         o Include *both* local roles assigned directly to us *and* those
           assigned to our groups.
 
-        o Ripped off from AccessControl.User.BasicUser, which provides
+        o Ripped off from AccessControl.users.BasicUser, which provides
           no other extension mechanism. :(
         """
 

src/Products/PlonePAS/pas.py

@@ -405,7 +405,7 @@ def _getAllLocalRoles(self, context):
 
 
 def authenticate(self, name, password, request):
-    """See AccessControl.User.BasicUserFolder.authenticate
+    """See AccessControl.userfolder:BasicUserFolder.authenticate
 
     Products.PluggableAuthService.PluggableAuthService does not provide this
     method, BasicUserFolder documents it as "Private UserFolder object

src/Products/PlonePAS/tests/test_membershiptool.py

@@ -1,11 +1,12 @@
 from AccessControl import getSecurityManager
 from AccessControl import Unauthorized
-from AccessControl.User import nobody
+from AccessControl.users import nobody
 from Acquisition import aq_base
 from Acquisition import aq_parent
 from DateTime import DateTime
 from io import BytesIO
 from OFS.Image import Image
+from pathlib import Path
 from plone.app.testing import login
 from plone.app.testing import logout
 from plone.app.testing import PLONE_SITE_ID
@@ -28,7 +29,6 @@
 from zope.component import adapter
 from zope.component import getGlobalSiteManager
 
-import os
 import unittest
 
 
@@ -205,10 +205,10 @@ def addMember(self, username, fullname, email, roles, last_login_time):
         )
 
     def makeRealImage(self):
+        # Note: the caller is responsible for calling 'close' in this image after use.
         import Products.PlonePAS as ppas
 
-        pas_path = os.path.dirname(ppas.__file__)
-        path = os.path.join(pas_path, "tool.gif")
+        path = Path(ppas.__file__).parent / "tool.gif"
         image = open(path, "rb")
         image_upload = dummy.FileUpload(dummy.FieldStorage(image))
         return image_upload
@@ -242,6 +242,7 @@ def testChangeOwnMemberPortrait(self):
         self.assertEqual(
             self.membership.getPersonalPortrait(TEST_USER_ID).meta_type, "Image"
         )
+        image.close()
 
     def testChangeOwnMemberPortraitWithEmailUsers(self):
         member_id = "[email protected]"
@@ -264,6 +265,7 @@ def testChangeOwnMemberPortraitWithEmailUsers(self):
         self.assertEqual(
             self.membership.getPersonalPortrait(member_id).meta_type, "Image"
         )
+        image.close()
 
     def testCannotChangeOtherMemberPortrait(self):
         # A normal member should not be able to change the portrait of
@@ -274,6 +276,7 @@ def testCannotChangeOtherMemberPortrait(self):
         self.assertRaises(
             Unauthorized, self.membership.changeMemberPortrait, image, "joe"
         )
+        image.close()
 
     def testChangeMemberPortraitAsManager(self):
         # Managers should be able to change the portrait of another
@@ -285,6 +288,7 @@ def testChangeMemberPortraitAsManager(self):
         self.membership.changeMemberPortrait(image, "joe")
         self.assertEqual(self.membership.getPersonalPortrait("joe").getId(), "joe")
         self.assertEqual(self.membership.getPersonalPortrait("joe").meta_type, "Image")
+        image.close()
 
     def testDeleteOwnPersonalPortrait(self):
         # Should delete the portrait image
@@ -297,6 +301,7 @@ def testDeleteOwnPersonalPortrait(self):
         self.assertEqual(
             self.membership.getPersonalPortrait(TEST_USER_ID).getId(), "defaultUser.png"
         )
+        image.close()
 
     def testCannotDeleteOtherPersonalPortrait(self):
         # A normal member should not be able to delete the portrait of
@@ -307,6 +312,7 @@ def testCannotDeleteOtherPersonalPortrait(self):
         self.membership.changeMemberPortrait(image, "joe")
         setRoles(self.portal, TEST_USER_ID, ["Member"])
         self.assertRaises(Unauthorized, self.membership.deletePersonalPortrait, "joe")
+        image.close()
 
     def testDeleteOtherPersonalPortraitAsManager(self):
         # Managers should be able to change the portrait of another
@@ -319,13 +325,15 @@ def testDeleteOtherPersonalPortraitAsManager(self):
         self.assertEqual(
             self.membership.getPersonalPortrait("joe").getId(), "defaultUser.png"
         )
+        image.close()
 
     def testGetPersonalPortraitWithoutPassingId(self):
         # Should return the logged in users portrait if no id is given
         image = self.makeRealImage()
         self.membership.changeMemberPortrait(image, TEST_USER_ID)
         self.assertEqual(self.membership.getPersonalPortrait().getId(), TEST_USER_ID)
         self.assertEqual(self.membership.getPersonalPortrait().meta_type, "Image")
+        image.close()
 
     def testPortraitForNonStandardUserId(self):
         # Some characters in a user id can give problems for getting
@@ -346,6 +354,7 @@ def testPortraitForNonStandardUserId(self):
         self.membership.changeMemberPortrait(image, user_id)
         self.assertEqual(self.membership.getPersonalPortrait().getId(), safe_id)
         self.assertEqual(self.membership.getPersonalPortrait().meta_type, "Image")
+        image.close()
 
         # Other users should be able to see your portrait.
         login(self.portal, TEST_USER_NAME)
@@ -372,6 +381,7 @@ def testPortraitForNonStandardUserId(self):
         self.assertEqual(
             self.membership.getPersonalPortrait(user_id).getId(), "defaultUser.png"
         )
+        manager_image.close()
 
     def testListMembers(self):
         # Should return the members list
@@ -670,8 +680,10 @@ def testGetBadMembers(self):
         self.portal.portal_memberdata._setPortrait(empty_file, TEST_USER_ID)
         self.assertEqual(self.membership.getBadMembers(), [])
         # And a good image
-        self.membership.changeMemberPortrait(self.makeRealImage(), TEST_USER_ID)
+        image = self.makeRealImage()
+        self.membership.changeMemberPortrait(image, TEST_USER_ID)
         self.assertEqual(self.membership.getBadMembers(), [])
+        image.close()
 
     def test_credentials_updated_event(self):
         events_fired = []

src/Products/PlonePAS/utils.py

@@ -49,20 +49,19 @@ def scale_image(image_file, max_size=None, default_format=None):
     from an input file
 
         >>> from Products.PlonePAS import config
-        >>> import os
+        >>> from pathlib import Path
         >>> from io import BytesIO
         >>> from Products.PlonePAS.utils import scale_image
         >>> from PIL import Image
 
     Let's make a couple test images and see how it works (all are
     100x100), the gif is paletted mode::
 
-        >>> pas_path = os.path.dirname(config.__file__)
-        >>> pjoin = os.path.join
-        >>> path = pjoin(pas_path, 'tests', 'images')
-        >>> orig_jpg = open(pjoin(path, 'test.jpg'), 'rb')
-        >>> orig_png = open(pjoin(path, 'test.png'), 'rb')
-        >>> orig_gif = open(pjoin(path, 'test.gif'), 'rb')
+        >>> pas_path = Path(config.__file__).parent
+        >>> path = pas_path / 'tests' / 'images'
+        >>> orig_jpg = (path / 'test.jpg').open('rb')
+        >>> orig_png = (path / 'test.png').open('rb')
+        >>> orig_gif = (path / 'test.gif').open('rb')
 
     We'll also make some evil non-images, including one which
     masquerades as a jpeg (which would trick OFS.Image)::
@@ -133,9 +132,9 @@ def scale_image(image_file, max_size=None, default_format=None):
         >>> img.size
         (50, 50)
 
-        orig_jpg.close()
-        orig_png.close()
-        orig_gif.close()
+        >>> orig_jpg.close()
+        >>> orig_png.close()
+        >>> orig_gif.close()
 
     """
     from PIL import Image