summaryrefslogtreecommitdiff
path: root/mailman/Utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'mailman/Utils.py')
-rw-r--r--mailman/Utils.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/mailman/Utils.py b/mailman/Utils.py
index 2c363a526..714ef3da7 100644
--- a/mailman/Utils.py
+++ b/mailman/Utils.py
@@ -319,8 +319,10 @@ def MakeRandomPassword(length=None):
if length is None:
length = config.MEMBER_PASSWORD_LENGTH
if config.USER_FRIENDLY_PASSWORDS:
- return UserFriendly_MakeRandomPassword(length)
- return Secure_MakeRandomPassword(length)
+ password = UserFriendly_MakeRandomPassword(length)
+ else:
+ password = Secure_MakeRandomPassword(length)
+ return password.decode('ascii')
def GetRandomSeed():