Use random instead of whrandom.

2 files changed, 12 insertions, 12 deletions

diff --git a/Lib/test/sortperf.py b/Lib/test/sortperf.py
index 8355f7a..58fd8a7 100644
--- a/Lib/test/sortperf.py
+++ b/Lib/test/sortperf.py
@@ -7,7 +7,7 @@ See tabulate() for output format.
 
 import sys
 import time
-import whrandom
+import random
 import marshal
 import tempfile
 import operator
@@ -23,7 +23,7 @@ def randrange(n):
     except IOError:
         result = []
         for i in range(n):
-            result.append(whrandom.random())
+            result.append(random.random())
         try:
             try:
                 fp = open(fn, "wb")
@@ -44,7 +44,7 @@ def randrange(n):
         ##assert len(result) == n
         # Shuffle it a bit...
         for i in range(10):
-            i = whrandom.randint(0, n-1)
+            i = random.randint(0, n-1)
             temp = result[:i]
             del result[:i]
             temp.reverse()
@@ -129,7 +129,7 @@ def main():
                     y = (y^h^d) & 255
                     h = h>>8
                     z = (z^h^d) & 255
-                whrandom.seed(x, y, z)
+                random.seed(x, y, z)
     r = range(k1, k2+1)                 # include the end point
     tabulate(r)
 
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 113135b..710fb89 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -3,12 +3,12 @@
 # Create a bunch of threads, let each do some work, wait until all are done
 
 from test_support import verbose
-import whrandom
+import random
 import thread
 import time
 
 mutex = thread.allocate_lock()
-whmutex = thread.allocate_lock() # for calls to whrandom
+rmutex = thread.allocate_lock() # for calls to random
 running = 0
 done = thread.allocate_lock()
 done.acquire()
@@ -17,9 +17,9 @@ numtasks = 10
 
 def task(ident):
 	global running
-	whmutex.acquire()
-	delay = whrandom.random() * numtasks
-	whmutex.release()
+	rmutex.acquire()
+	delay = random.random() * numtasks
+	rmutex.release()
 	if verbose:
 	    print 'task', ident, 'will run for', round(delay, 1), 'sec'
 	time.sleep(delay)
@@ -85,9 +85,9 @@ def task2(ident):
 			# of the current one
 			delay = 0.001
 		else:
-			whmutex.acquire()
-			delay = whrandom.random() * numtasks
-			whmutex.release()
+			rmutex.acquire()
+			delay = random.random() * numtasks
+			rmutex.release()
 		if verbose:
 		    print 'task', ident, 'will run for', round(delay, 1), 'sec'
 		time.sleep(delay)