if sys.version_info.major < 3:
timerbase = threading._Timer
+ stringbase = basestring
else:
+ import tempfile
timerbase = threading.Timer
+ stringbase = str
try:
if json is not None and json.dump is not None:
# json.dump(self.db, open(self.questionfile, "w"))#, indent=4, separators=(',', ': '))
dbjson = json.dumps(self.db)
+ # we have to do a dance to save the file to make the update atomic, and also because Py3 doesn't have os.tempnam in the misguided pursuit of "security"
if len(dbjson) > 0:
os.rename(self.questionfile, self.questionfile+".auto.bak")
- tmpfn = os.tempnam('.', 'trivia')
try:
- f = open(tmpfn, "w")
+ if sys.version_info.major < 3:
+ tmpfn = os.tempnam('.', 'trivia')
+ f = open(tmpfn, "w")
+ else:
+ fd, tmpfn = tempfile.mkstemp(dir='.', prefix='trivia')
+ f = open(fd, "w")
f.write(dbjson)
f.close()
os.rename(tmpfn, self.questionfile)
os.unlink(tmpfn)
except OSError: # temp file is already gone
pass
- raise # we may be better off just swallowing exceptions?
+ except UnboundLocalError:
+ pass
+ raise
return False
def getchan(self):
self.lastqid = self.curqid
self.curq = None
self.curqid = None
+ self.lastqtime = time.time()
if self.gameover == True:
return self.doGameOver()
if qskipped:
+ self.streak = 0
+ self.streak_holder = None
self.getchan().fastmsg("\00304Fail! The correct answer was: %s" % (self.hintanswer))
self.missedquestions += 1
else:
else:
nextq.append(time.time())
- if isinstance(nextq[1], basestring):
+ if isinstance(nextq[1], stringbase):
nextq[1] = nextq[1].lower()
else:
nextq[1] = [s.lower() for s in nextq[1]]
qtext += " "
for qword in qary:
spacer = random.choice(
- range(0x61,0x7A) + ([0x20]*4)
+ list(range(0x61,0x7A)) + ([0x20]*4)
)
qtext += "\00304,01"+qword+"\00301,01"+chr(spacer) #a-z
if not self.getbot().fastmsg(self.chan, qtext): #if message is too long:
self.curq = nextq
self.curqid = nextqid
- if isinstance(self.curq[1], basestring): self.hintanswer = self.curq[1]
+ if isinstance(self.curq[1], stringbase): self.hintanswer = self.curq[1]
else: self.hintanswer = random.choice(self.curq[1])
self.steptimer = MyTimer(self.db['hinttimer'], self.nexthint, args=[1])
def checkanswer(self, answer):
if self.curq is None:
return False
- elif isinstance(self.curq[1], basestring):
+ elif isinstance(self.curq[1], stringbase):
return answer.lower() == self.curq[1]
else: # assume it's a list or something.
return answer.lower() in self.curq[1]
if state.streak_holder == user:
state.streak += 1
else:
+ if state.streak >= 3:
+ bot.fastmsg(chan, "\00312%s\003 broke \00304%s\003's streak of \00307%d\003!" % (user, state.streak_holder, state.streak))
state.streak_holder = user
state.streak = 1
- response = "\00312%s\003 has it! The answer was \00312%s\003" % (user, line)
+ response = "\00312%s\003 got it in %d seconds! The answer was \00312%s\003" % (user, time.time()-state.lastqtime, line)
if state.hintanswer.lower() != line.lower():
response += " (hinted answer: %s)" % (state.hintanswer)
response += ". New score: %d. Rank: %d. Target: %s %s" % (state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user))
else: replyto = user
if chan is not None and chan.name != state.db['chan']:
- bot.msg(replyto, "That command isn't valid here.")
+ bot.msg(replyto, "That command is only valid in %s" % (state.db['chan']))
return
if state.curq is None and state.pointvote is None and state.nextquestiontimer is None: