Merge pull request #82 from zopefoundation/fix-deprecations

Fix DeprecationWarnings occurring on Zope 5.
zopefoundation · Oct 30, 2020 · 15f2fc1 · 15f2fc1
2 parents 09e4e64 + 2ddd689
commit 15f2fc1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,7 @@ Change Log
 2.5.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Fix DeprecationWarnings occurring on Zope 5.
 
 
 2.5 (2020-10-12)

diff --git a/Products/PluggableAuthService/PropertiedUser.py b/Products/PluggableAuthService/PropertiedUser.py
@@ -15,7 +15,7 @@
 """
 
 from AccessControl.PermissionRole import _what_not_even_god_should_do
-from AccessControl.User import BasicUser
+from AccessControl.users import BasicUser
 from Acquisition import aq_inner
 from Acquisition import aq_parent
 

diff --git a/Products/PluggableAuthService/plugins/NotCompetentHelper.py b/Products/PluggableAuthService/plugins/NotCompetentHelper.py
@@ -23,7 +23,7 @@
 
 from AccessControl import ClassSecurityInfo
 from AccessControl.Permissions import manage_users
-from AccessControl.User import nobody
+from AccessControl.users import nobody
 from Acquisition import aq_base
 from Acquisition import aq_inner
 from Acquisition import aq_parent

diff --git a/Products/PluggableAuthService/plugins/ZODBUserManager.py b/Products/PluggableAuthService/plugins/ZODBUserManager.py
@@ -18,11 +18,11 @@
 
 import six
 
-from AccessControl import AuthEncoding
 from AccessControl import ClassSecurityInfo
 from AccessControl.class_init import InitializeClass
 from AccessControl.requestmethod import postonly
 from AccessControl.SecurityManagement import getSecurityManager
+from AuthEncoding import AuthEncoding
 from BTrees.OOBTree import OOBTree
 from OFS.Cache import Cacheable
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile

diff --git a/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.py b/Products/PluggableAuthService/plugins/tests/test_ZODBUserManager.py
@@ -13,7 +13,7 @@
 ##############################################################################
 import unittest
 
-from AccessControl.AuthEncoding import pw_encrypt
+from AuthEncoding.AuthEncoding import pw_encrypt
 from zExceptions import Forbidden
 
 from ...plugins.tests.helpers import makeRequestAndResponse
@@ -521,7 +521,7 @@ def test_getUserByIdWithOptionalMangling(self):
 
     def test_addUser_with_not_yet_encrypted_password(self):
         # See collector #1869 && #1926
-        from AccessControl.AuthEncoding import is_encrypted
+        from AuthEncoding.AuthEncoding import is_encrypted
 
         USER_ID = 'not_yet_encrypted'
         PASSWORD = 'password'
@@ -538,7 +538,7 @@ def test_addUser_with_not_yet_encrypted_password(self):
 
     def test_addUser_with_preencrypted_password(self):
         # See collector #1869 && #1926
-        from AccessControl.AuthEncoding import pw_encrypt
+        from AuthEncoding.AuthEncoding import pw_encrypt
 
         USER_ID = 'already_encrypted'
         PASSWORD = 'password'
@@ -554,7 +554,7 @@ def test_addUser_with_preencrypted_password(self):
         self.assertEqual(uid_and_info, (USER_ID, USER_ID))
 
     def test_updateUserPassword_with_not_yet_encrypted_password(self):
-        from AccessControl.AuthEncoding import is_encrypted
+        from AuthEncoding.AuthEncoding import is_encrypted
 
         USER_ID = 'not_yet_encrypted'
         PASSWORD = 'password'

diff --git a/Products/PluggableAuthService/tests/test_UserFolder.py b/Products/PluggableAuthService/tests/test_UserFolder.py
@@ -224,7 +224,7 @@ def user_names(self):
 
     def test__doAddUser_with_not_yet_encrypted_passwords(self):
         # See collector #1869 && #1926
-        from AccessControl.AuthEncoding import is_encrypted
+        from AuthEncoding.AuthEncoding import is_encrypted
 
         USER_ID = 'not_yet_encrypted'
         PASSWORD = 'password'
@@ -240,7 +240,7 @@ def test__doAddUser_with_not_yet_encrypted_passwords(self):
 
     def test__doAddUser_with_preencrypted_passwords(self):
         # See collector #1869 && #1926
-        from AccessControl.AuthEncoding import pw_encrypt
+        from AuthEncoding.AuthEncoding import pw_encrypt
 
         USER_ID = 'already_encrypted'
         PASSWORD = 'password'