Fix deprecation warnings.

src/AccessControl/tests/test_userfolder.py

@@ -148,7 +148,7 @@ def user_names(self):
 
     def test__doAddUser_with_not_yet_encrypted_passwords(self):
         # See collector #1869 && #1926
-        from AccessControl.AuthEncoding import pw_validate
+        from AuthEncoding.AuthEncoding import pw_validate
 
         USER_ID = 'not_yet_encrypted'
         PASSWORD = 'password'
@@ -164,7 +164,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_validate
+        from AuthEncoding.AuthEncoding import pw_validate
 
         USER_ID = 'already_encrypted'
         PASSWORD = 'password'

src/AccessControl/userfolder.py

@@ -23,13 +23,13 @@
 from Acquisition import Implicit
 from Acquisition import aq_base
 from Acquisition import aq_parent
+from AuthEncoding import AuthEncoding
 from Persistence import Persistent
 from Persistence import PersistentMapping
 from zExceptions import BadRequest
 from zExceptions import Unauthorized
 from zope.interface import implementer
 
-from AccessControl import AuthEncoding
 from AccessControl import ClassSecurityInfo
 from AccessControl.class_init import InitializeClass
 from AccessControl.interfaces import IStandardUserFolder

src/AccessControl/users.py

@@ -19,10 +19,10 @@
 
 from Acquisition import Implicit
 from Acquisition import aq_inContextOf
+from AuthEncoding import AuthEncoding
 from Persistence import Persistent
 from zope.interface import implementer
 
-from AccessControl import AuthEncoding
 from AccessControl import SpecialUsers
 from AccessControl.interfaces import IUser
 from AccessControl.PermissionRole import _what_not_even_god_should_do