whrandom -> random

Demo/pdist/security.py

@@ -22,8 +22,8 @@ class Security:
 			raise IOError, "python keyfile %s: cannot open" % keyfile
 
 	def _generate_challenge(self):
-		import whrandom
-		return whrandom.randint(100, 100000)
+		import random
+		return random.randint(100, 100000)
 
 	def _compare_challenge_response(self, challenge, response):
 		return self._encode_challenge(challenge) == response

Demo/scripts/markov.py

@@ -31,7 +31,7 @@ class Markov:
 		return seq
 
 def test():
-	import sys, string, whrandom, getopt
+	import sys, string, random, getopt
 	args = sys.argv[1:]
 	try:
 		opts, args = getopt.getopt(args, '0123456789cdw')
@@ -59,7 +59,7 @@ def test():
 		if o == '-q': debug = 0
 		if o == '-w': do_words = 1
 	if not args: args = ['-']
-	m = Markov(histsize, whrandom.choice)
+	m = Markov(histsize, random.choice)
 	try:
 	    for filename in args:
 		    if filename == '-':

Demo/threads/sync.py

@@ -566,13 +566,13 @@ def _run_one_sort(tid, a, bar, done):
 
 def test():
     global TID, tid, io, wh, randint, alive
-    import whrandom
-    randint = whrandom.randint
+    import random
+    randint = random.randint
 
     TID = 0                             # thread ID (1, 2, ...)
     tid = thread.allocate_lock()        # for changing TID
     io  = thread.allocate_lock()        # for printing, and 'alive'
-    wh  = thread.allocate_lock()        # for calls to whrandom
+    wh  = thread.allocate_lock()        # for calls to random
     alive = []                          # IDs of active threads
 
     NSORTS = 5

Demo/tkinter/guido/electrons.py

@@ -41,12 +41,12 @@ class Electrons:
 		self.tk.update()
 
 	def random_move(self,n):
-		import whrandom
+		import random
 		c = self.canvas
 		for i in range(1,n+1):
 			p = self.pieces[i]
-			x = whrandom.choice(range(-2,4))
-			y = whrandom.choice(range(-3,4))
+			x = random.choice(range(-2,4))
+			y = random.choice(range(-3,4))
 			c.move(p, x, y)
 		self.tk.update()
 

Tools/faqwiz/faqwiz.py

@@ -572,12 +572,12 @@ class FaqWizard:
         emit(TAIL_RECENT)
 
     def do_roulette(self):
-        import whrandom
+        import random
         files = self.dir.list()
         if not files: 
             self.error("No entries.")
             return
-        file = whrandom.choice(files)
+        file = random.choice(files)
         self.prologue(T_ROULETTE)
         emit(ROULETTE)
         self.dir.show(file)