help - clarify genhelp command

[erebus.git] / modules / trivia.py

diff --git a/modules/trivia.py b/modules/trivia.py
index cb4b407bec7e718a66827de48344ade33b518522..89d62d5d881c7a2d4d3881494d16d52e5b834a5b 100644 (file)
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -110,14 +110,6 @@ class TriviaState(object):
                        self.nextquestiontimer.cancel()
                        self.nextquestiontimer = None
                except: pass
-#TODO remove if the replacement works
-#              if threading is not None and threading._Timer is not None:
-#                      if isinstance(self.steptimer, threading._Timer):
-#                              self.steptimer.cancel()
-#                      if isinstance(self.nextquestiontimer, threading._Timer):
-#                              self.nextquestiontimer.cancel()
-#                              self.nextquestiontimer = None
-#              self.savedb()
 
        def savedb(self): #returns whether or not it was able to save
                if json is not None and json.dump is not None:
@@ -138,7 +130,7 @@ class TriviaState(object):
                                                os.unlink(tmpfn)
                                        except OSError: # temp file is already gone
                                                pass
-                                       raise #TODO: we may be better off just swallowing exceptions?
+                                       raise # we may be better off just swallowing exceptions?
                return False
 
        def getchan(self):
@@ -858,8 +850,8 @@ def num_TOPIC(bot, textline):
                        "%s (%s)" % (person(x), pts(x))
                        for x in range(3) if x < len(state.db['ranks'])
                ]),
-               'top3c': ' '.join([
-                       "%s (%s, %s)" % (person(x), pts(x), country(x))
+               'top3c': ', '.join([
+                       "%s (%s) %s" % (person(x), country(x), pts(x))
                        for x in range(3) if x < len(state.db['ranks'])
                ]),
                'top10': ' '.join([
@@ -890,6 +882,7 @@ def specialQuestion(oldq):
                randnum2 = random.randrange(0, 11)
                newq[0] = "What is %d + %d?" % (randnum1, randnum2)
                newq[1] = spellout(randnum1+randnum2)
+       else: pass #default to not modifying
        return newq
 
 def spellout(num):