- Bump copyright years.

- Refactor to use the flufl.password package.
- Adapt to the API for flufl.bounce 2.0.
- Add a `bin/mailman shell` alias for `bin/mailman withlist`.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/mailman/app/subscriptions.py b/src/mailman/app/subscriptions.py
index 9eba89d8b..668f97dbd 100644
--- a/src/mailman/app/subscriptions.py
+++ b/src/mailman/app/subscriptions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 by the Free Software Foundation, Inc.
 #
 # This file is part of GNU Mailman.
 #
@@ -26,6 +26,7 @@ __all__ = [
     ]
 
 
+from flufl.password import generate
 from operator import attrgetter
 from storm.expr import And, Or
 from uuid import UUID
@@ -43,7 +44,6 @@ from mailman.interfaces.subscriptions import (
     ISubscriptionService, MissingUserError)
 from mailman.interfaces.usermanager import IUserManager
 from mailman.model.member import Member
-from mailman.utilities.passwords import make_user_friendly_password
 
 
 
@@ -161,7 +161,7 @@ class SubscriptionService:
             # password to a system default.  This will have to get reset since
             # it can't be retrieved.  Note that none of these are used unless
             # the address is completely new to us.
-            password = make_user_friendly_password()
+            password = generate(int(config.passwords.password_length))
             return add_member(mlist, subscriber, real_name, password,
                               delivery_mode,
                               system_preferences.preferred_language, role)