further py3 compatibility work

diff --git a/bot.py b/bot.py
index 0e6e9263d7b072ae372156346349c4f21195b092..ed45293998fcb0efde7e83a55602ddf5beacaacc 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -185,7 +185,7 @@ class Bot(object):
                                self.msg(nick, "I tried, but you're not authed!")
        def _got433(self, pieces):
                if not self.conn.registered(): #we're trying to connect
-                       newnick = "%s%d" % (self.nick, random.randint(111,999))
+                       newnick = "%s%d" % (self.nick, random.randint(111, 999))
                        self.conn.send("NICK %s" % (newnick))
                        self.nick = newnick
        def _gotjoin(self, pieces):

diff --git a/erebus.py b/erebus.py
index b8552e670749eb87c1009338b454ee67e42c35ce..fc3aca08ef98abcbabc6f46856fe768cb5e6ea04 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -71,7 +71,7 @@ class Erebus(object): #singleton to pass around
                        self.nick = newnick
 
                def __str__(self): return self.nick
-               def __repr__(self): return "<User %r (%d)>" % (self.nick,self.glevel)
+               def __repr__(self): return "<User %r (%d)>" % (self.nick, self.glevel)
 
        class Channel(object):
                def __init__(self, name, bot):
@@ -188,7 +188,7 @@ class Erebus(object): #singleton to pass around
        def fd(self, fileno): #get Bot() by fd/fileno
                return self.fds[fileno]
        def randbot(self): #get Bot() randomly
-               return self.bots[random.choice(self.bots.keys())]
+               return self.bots[random.choice(list(self.bots.keys()))]
 
        def user(self, _nick, justjoined=False, create=True):
                nick = _nick.lower()

diff --git a/modlib.py b/modlib.py
index 8bd6adb63c297500538c08a83c0d4d7233fe2ffc..e4686a2546aa1044018e4fa330562f2573f701f8 100644 (file)
--- a/modlib.py
+++ b/modlib.py
@@ -14,6 +14,7 @@ class error(object):
                self.errormsg = desc
        def __nonzero__(self):
                return False #object will test to False
+       __bool__ = __nonzero__ #py3 compat
        def __repr__(self):
                return '<modlib.error %r>' % self.errormsg
        def __str__(self):
@@ -179,6 +180,6 @@ class modlib(object):
                                        self.mod('help').reghelp(func, *args, **kwargs)
                                except:
                                        pass
-                       self.helps.append((func,args,kwargs))
+                       self.helps.append((func, args, kwargs))
                        return func
                return realhook