From: Guido van Rossum <guido@python.org>
Date: Mon, 2 Jun 1997 22:52:37 +0000 (+0000)
Subject: Move the roulette() functionality out of the FaqDir class into the
X-Git-Tag: v1.5a3~377
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=525d52f8a44e514547d80caae0fcbb6acd78b0e0;p=thirdparty%2FPython%2Fcpython.git

Move the roulette() functionality out of the FaqDir class into the
FaqWizard class.
---

diff --git a/Tools/faqwiz/faqwiz.py b/Tools/faqwiz/faqwiz.py
index 06e1ab5106c1..804e6116bd6e 100644
--- a/Tools/faqwiz/faqwiz.py
+++ b/Tools/faqwiz/faqwiz.py
@@ -325,12 +325,6 @@ class FaqDir:
 	sec, num = self.__okprog.group(1, 2)
 	return string.atoi(sec), string.atoi(num)
 
-    def roulette(self):
-	self.__fill()
-	import whrandom
-	if not self.__files: return None
-	return whrandom.choice(self.__files)
-
     def list(self):
 	# XXX Caller shouldn't modify result
 	self.__fill()
@@ -577,10 +571,12 @@ class FaqWizard:
 	emit(TAIL_RECENT)
 
     def do_roulette(self):
-	file = self.dir.roulette()
-	if not file:
+	import whrandom
+	files = self.dir.list()
+	if not files: 
 	    self.error("No entries.")
 	    return
+	file = whrandom.choice(files)
 	self.prologue(T_ROULETTE)
 	self.dir.show(file)