2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index bd3a1dc90..9839de333 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-11-08  Jeremy Katz  <katzj@redhat.com>
 
+	* users.py: whrandom is deprecated, use random instead
+
 	* bootloader.py: remove unneeded import of deprecated whrandom module
 
 	* iw/bootloader_main_gui.py
diff --git a/users.py b/users.py
index 11ad49933..05d5a406c 100644
--- a/users.py
+++ b/users.py
@@ -15,7 +15,7 @@
 #
 
 import iutil
-import whrandom
+import random
 import crypt
 import os
 import string
@@ -79,10 +79,10 @@ class Password:
 	    self.crypt = password
 	    self.pure = None
 	else:
-            salt = (whrandom.choice (string.letters +
-                                     string.digits + './') + 
-                    whrandom.choice (string.letters +
-                                     string.digits + './'))
+            salt = (random.choice (string.letters +
+                                   string.digits + './') + 
+                    random.choice (string.letters +
+                                   string.digits + './'))
             self.crypt = crypt.crypt (password, salt)
 	    self.pure = password
 
@@ -120,8 +120,8 @@ def cryptPassword(password, useMD5):
 	saltLen = 2
 
     for i in range(saltLen):
-	salt = salt + whrandom.choice (string.letters +
-                                       string.digits + './')
+	salt = salt + random.choice (string.letters +
+                                     string.digits + './')
 
     return crypt.crypt (password, salt)