userinfo - use return-to-reply shortcut

[erebus.git] / erebus.py

diff --git a/erebus.py b/erebus.py
index b8552e670749eb87c1009338b454ee67e42c35ce..ae8390f94440e946c0e8afbf63180a06b59c5b08 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# vim: fileencoding=utf-8
 
 # Erebus IRC bot - Author: John Runyon
 # main startup code
@@ -71,7 +72,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 +189,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()
@@ -283,7 +284,7 @@ def dbsetup():
 def setup():
        global cfg, main
 
-       cfg = config.setup('bot.config')
+       cfg = config.Config('bot.config')
 
        if cfg.getboolean('debug', 'gc'):
                gc.set_debug(gc.DEBUG_LEAK)