X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/656dc5a4759b810a632859a32721493e522748a1..96dfdcd3388fede51b41e1e7094c28f6ff2d4715:/modules/trivia.py

diff --git a/modules/trivia.py b/modules/trivia.py
index f2d3671..3e79db3 100644
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -1,12 +1,15 @@
 # Erebus IRC bot - Author: Erebus Team
+# vim: fileencoding=utf-8
 # trivia module
 # This file is released into the public domain; see http://unlicense.org/
 
+from __future__ import print_function
+
 # module info
 modinfo = {
 	'author': 'Erebus Team',
 	'license': 'public domain',
-	'compatible': [2],
+	'compatible': [0],
 	'depends': ['userinfo'],
 	'softdeps': ['help'],
 }
@@ -28,7 +31,13 @@ def modstop(*args, **kwargs):
 	return lib.modstop(*args, **kwargs)
 
 # module code
-import json, random, threading, re, time, datetime, os
+import json, random, threading, re, time, datetime, os, sys
+
+if sys.version_info.major < 3:
+	timerbase = threading._Timer
+else:
+	timerbase = threading.Timer
+
 
 try:
 	import twitter
@@ -58,9 +67,9 @@ def pts(num):
 def country(num, default="??"):
 	return lib.mod('userinfo')._get(person(num), 'country', default=default).upper()
 
-class MyTimer(threading._Timer):
+class MyTimer(timerbase):
 	def __init__(self, *args, **kwargs):
-		threading._Timer.__init__(self, *args, **kwargs)
+		timerbase.__init__(self, *args, **kwargs)
 		self.daemon = True
 
 class TriviaState(object):
@@ -520,12 +529,12 @@ def stop():
 	try:
 		state.steptimer.cancel()
 	except Exception as e:
-		print "!!! steptimer.cancel(): %s %r" % (e,e)
+		print("!!! steptimer.cancel(): %s %r" % (e,e))
 	state.steptimer = None
 	try:
 		state.nextquestiontimer.cancel()
 	except Exception as e:
-		print "!!! nextquestiontimer.cancel(): %s %r" % (e,e)
+		print("!!! nextquestiontimer.cancel(): %s %r" % (e,e))
 	state.nextquestiontimer = None
 	return True
 
@@ -611,7 +620,7 @@ def settarget(bot, user, chan, realtarget, *args):
 			state.pointvote = None
 			bot.msg(state.db['chan'], "Vote has been cancelled!")
 	except Exception as e:
-		print e
+		print(e)
 		bot.msg(user, "Failed to set target.")
 
 @lib.hook(needchan=False)
@@ -843,7 +852,8 @@ def triviahelp(bot, user, chan, realtarget, *args):
 				bot.slowmsg(user, "HINTNUM       <hints>           (ADMIN)")
 				bot.slowmsg(user, "QUESTIONPAUSE <float seconds>   (ADMIN)")
 
-@lib.hooknum(332)
+@lib.hooknum(332) # topic is...
+@lib.hooknum(331) # no topic set
 def num_TOPIC(bot, textline):
 	pieces = textline.split(None, 4)
 	chan = pieces[3]
@@ -876,7 +886,7 @@ def num_TOPIC(bot, textline):
 		'category': state.db['category'],
 	}
 	if gottopic != formatted:
-		state.getbot().conn.send("TOPIC %s :%s" % (state.db['chan'], formatted))
+		state.getbot().conn.send(bot.parent.cfg.get('trivia', 'topiccommand', default="TOPIC %(chan)s :%(topic)s") % {'chan': state.db['chan'], 'topic': formatted})
 
 
 def specialQuestion(oldq):