userinfo - py3 has dict_keys which doesnt support +... ugh

[erebus.git] / modules / trivia.py

diff --git a/modules/trivia.py b/modules/trivia.py
index 251588c39281b39aea57d0754841e207cf5a33ce..f36774926c6a7f0e766fc3fd1874ccaf59462f31 100644 (file)
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -35,8 +35,11 @@ import json, random, threading, re, time, datetime, os, sys
 
 if sys.version_info.major < 3:
        timerbase = threading._Timer
+       stringbase = basestring
 else:
+       import tempfile
        timerbase = threading.Timer
+       stringbase = str
 
 
 try:
@@ -130,11 +133,16 @@ class TriviaState(object):
                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)
@@ -145,7 +153,9 @@ class TriviaState(object):
                                                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):
@@ -159,7 +169,7 @@ class TriviaState(object):
                if self.hintstr is None or self.revealpossibilities is None or self.reveal is None:
                        oldhintstr = ""
                        self.hintstr = list(re.sub(r'[a-zA-Z0-9]', '*', answer))
-                       self.revealpossibilities = range(''.join(self.hintstr).count('*'))
+                       self.revealpossibilities = list(range(''.join(self.hintstr).count('*')))
                        self.reveal = int(round(''.join(self.hintstr).count('*') * (7/24.0)))
                else:
                        oldhintstr = ''.join(self.hintstr)
@@ -234,7 +244,7 @@ class TriviaState(object):
                        insertpos = f.tell()
                        fcontents = f.read()
                        f.seek(insertpos)
-                       f.write((self.db['hofformat']+"\n") % {
+                       new_line = self.db['hofformat'] % {
                                'date': time.strftime("%F", time.gmtime()),
                                'duration': str(datetime.timedelta(seconds=time.time()-self.db['lastwon'])),
                                'targetscore': self.db['target'],
@@ -244,10 +254,14 @@ class TriviaState(object):
                                'secondscore': pts(1),
                                'thirdperson': person(2),
                                'thirdscore': pts(2),
-                       })
+                       }
+                       f.write(new_line.encode() + b"\n")
                        f.write(fcontents)
                        status = True
                except Exception as e:
+                       print(repr(e))
+                       print(type(e))
+                       print(e.message)
                        status = False
                finally:
                        if f is not None:
@@ -332,7 +346,7 @@ class TriviaState(object):
                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]]
@@ -343,7 +357,7 @@ class TriviaState(object):
                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:
@@ -355,7 +369,7 @@ class TriviaState(object):
                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])
@@ -364,7 +378,7 @@ class TriviaState(object):
        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]