From 37c255b7b0c1b8ea10c8d24a44c8586de86ffcc6 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Mon, 5 Jan 2009 00:54:19 -0500
Subject: Defaults module is mostly eradicated, converted to lazr.config.  The
 test suite does not yet work though.

---
 mailman/Utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mailman/Utils.py')

diff --git a/mailman/Utils.py b/mailman/Utils.py
index 56f186a17..31848d5c8 100644
--- a/mailman/Utils.py
+++ b/mailman/Utils.py
@@ -35,11 +35,11 @@ import email.Header
 import email.Iterators
 
 from email.Errors import HeaderParseError
+from lazr.config import as_boolean
 from string import ascii_letters, digits, whitespace, Template
 
 import mailman.templates
 
-from mailman import Defaults
 from mailman import passwords
 from mailman.config import config
 from mailman.core import errors
@@ -318,8 +318,8 @@ def Secure_MakeRandomPassword(length):
 
 def MakeRandomPassword(length=None):
     if length is None:
-        length = Defaults.MEMBER_PASSWORD_LENGTH
-    if Defaults.USER_FRIENDLY_PASSWORDS:
+        length = int(config.member_password_length)
+    if as_boolean(config.user_friendly_passwords):
         password = UserFriendly_MakeRandomPassword(length)
     else:
         password = Secure_MakeRandomPassword(length)
-- 
cgit v1.2.3-70-g09d2