Merge pull request #209 from plone/adopt_user-zope-users

Support Zope users in user.adopt_user

docs/CHANGES.rst

@@ -10,6 +10,9 @@ Changelog
 - Fixed `make docs`.
   [jaroel]
 
+- Support Zope users in user.adopt_user. Fixes #171 and #157.
+  [jaroel]
+
 - explicit dependencies in setup.py, explicit zcml loading in tests.
   [jensens]
 

src/plone/api/env.py

@@ -32,11 +32,22 @@ def adopt_user(username=None, user=None):
     # Grab the user object out of acl_users because this function
     # accepts 'user' objects that are actually things like MemberData
     # objects, which AccessControl isn't so keen on.
-    acl_users = portal.get().acl_users
+
+    unwrapped = None
+    plone = portal.get()
+    acls = [plone.acl_users, plone.__parent__.acl_users]
+
     if username is None:
-        unwrapped = acl_users.getUserById(user.getId())
+        for acl_users in acls:
+            unwrapped = acl_users.getUserById(user.getId())
+            if unwrapped:
+                break
     else:
-        unwrapped = acl_users.getUser(username)
+        for acl_users in acls:
+            unwrapped = acl_users.getUser(username)
+            if unwrapped:
+                break
+
     if unwrapped is None:
         raise UserNotFoundError
 

src/plone/api/tests/test_env.py

@@ -367,6 +367,10 @@ def test_adopted_nested_ownership(self):
             ])
         # /user worker
 
+    def test_adopting_zope_users(self):
+        api.env.adopt_user(username='admin')
+        api.env.adopt_user(user=api.user.get(username='admin'))
+
     def test_empty_warning(self):
         """Tests that empty roles lists get warned about."""
         from plone.api.exc import InvalidParameterError