trunk merge

2 files changed, 9 insertions, 10 deletions

diff --git a/src/mailman/rest/docs/users.rst b/src/mailman/rest/docs/users.rst
index a20306e17..cdede10ee 100644
--- a/src/mailman/rest/docs/users.rst
+++ b/src/mailman/rest/docs/users.rst
@@ -94,7 +94,7 @@ It is also available via the location given in the response.
     created_on: 2005-08-01T07:49:23
     display_name: Bart Person
     http_etag: "..."
-    password: {CLEARTEXT}bbb
+    password: {plaintext}bbb
     self_link: http://localhost:9001/3.0/users/3
     user_id: 3
 
@@ -105,7 +105,7 @@ them with user ids.  Thus, a user can be retrieved via its email address.
     created_on: 2005-08-01T07:49:23
     display_name: Bart Person
     http_etag: "..."
-    password: {CLEARTEXT}bbb
+    password: {plaintext}bbb
     self_link: http://localhost:9001/3.0/users/3
     user_id: 3
 
@@ -129,7 +129,7 @@ therefore cannot be retrieved.  It can be reset though.
     created_on: 2005-08-01T07:49:23
     display_name: Cris Person
     http_etag: "..."
-    password: {CLEARTEXT}...
+    password: {plaintext}...
     self_link: http://localhost:9001/3.0/users/4
     user_id: 4
 
@@ -227,7 +227,7 @@ In fact, any of these addresses can be used to look up Bart's user record.
     created_on: 2005-08-01T07:49:23
     display_name: Bart Person
     http_etag: "..."
-    password: {CLEARTEXT}bbb
+    password: {plaintext}bbb
     self_link: http://localhost:9001/3.0/users/3
     user_id: 3
 
@@ -235,7 +235,7 @@ In fact, any of these addresses can be used to look up Bart's user record.
     created_on: 2005-08-01T07:49:23
     display_name: Bart Person
     http_etag: "..."
-    password: {CLEARTEXT}bbb
+    password: {plaintext}bbb
     self_link: http://localhost:9001/3.0/users/3
     user_id: 3
 
@@ -243,7 +243,7 @@ In fact, any of these addresses can be used to look up Bart's user record.
     created_on: 2005-08-01T07:49:23
     display_name: Bart Person
     http_etag: "..."
-    password: {CLEARTEXT}bbb
+    password: {plaintext}bbb
     self_link: http://localhost:9001/3.0/users/3
     user_id: 3
 
@@ -251,6 +251,6 @@ In fact, any of these addresses can be used to look up Bart's user record.
     created_on: 2005-08-01T07:49:23
     display_name: Bart Person
     http_etag: "..."
-    password: {CLEARTEXT}bbb
+    password: {plaintext}bbb
     self_link: http://localhost:9001/3.0/users/3
     user_id: 3
diff --git a/src/mailman/rest/users.py b/src/mailman/rest/users.py
index 4e1362120..bce541ae5 100644
--- a/src/mailman/rest/users.py
+++ b/src/mailman/rest/users.py
@@ -26,7 +26,7 @@ __all__ = [
     ]
 
 
-from flufl.password import lookup, make_secret, generate
+from passlib.utils import generate_password as generate
 from restish import http, resource
 from uuid import UUID
 from zope.component import getUtility
@@ -102,8 +102,7 @@ class AllUsers(_UserBase):
         if password is None:
             # This will have to be reset since it cannot be retrieved.
             password = generate(int(config.passwords.password_length))
-        scheme = lookup(config.passwords.password_scheme.upper())
-        user.password = make_secret(password, scheme)
+        user.password = config.password_context.encrypt(password)
         location = path_to('users/{0}'.format(user.user_id.int))
         return http.created(location, [], None)