minor bug fixes

diff --git a/bot.py b/bot.py
index 5f9f26f39fa38706f83b9cd8925678407e0b05c4..d7502ba448e746295b5e3a9e303cd51843463e28 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -175,8 +175,6 @@ class Bot(object):
        def __repr__(self): return "<Bot %r>" % (self.nick)
 
 class BotConnection(object):
-       state = 0 # 0=disconnected, 1=registering, 2=connected
-
        def __init__(self, parent, bind, server, port):
                self.parent = parent
                self.buffer = ''
@@ -186,6 +184,8 @@ class BotConnection(object):
                self.server = server
                self.port = int(port)
 
+               self.state = 0 # 0=disconnected, 1=registering, 2=connected
+
        def connect(self):
                self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                self.socket.bind((self.bind, 0))
@@ -205,17 +205,17 @@ class BotConnection(object):
        #TODO: rewrite send() to queue
        def send(self, line):
                print self.parent.nick, '[O]', str(line)
-               self.write(line)
+               self._write(line)
 
-       def write(self, line):
+       def _write(self, line):
                self.socket.sendall(line+"\r\n")
 
        def read(self):
                self.buffer += self.socket.recv(8192)
                lines = []
 
-               while '\r\n' in self.buffer:
-                       pieces = self.buffer.split('\r\n', 1)
+               while "\r\n" in self.buffer:
+                       pieces = self.buffer.split("\r\n", 1)
                        print self.parent.nick, '[I]', pieces[0]
                        lines.append(pieces[0])
                        self.buffer = pieces[1]

diff --git a/erebus.py b/erebus.py
index ef45b792f691d8461134500c60bc8e83acb7a34a..c03c98053d0577093b2fe6da39cf34342baf9dd9 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -153,7 +153,7 @@ class Erebus(object):
        def fd(self, fileno): #get Bot() by fd/fileno
                return self.fds[fileno]
        def randbot(self): #get Bot() randomly
-               return random.choice(self.bots)
+               return self.bots[random.choice(self.bots.keys())]
 
        def user(self, _nick, justjoined=False):
                nick = _nick.lower()