From: zonidjan <redacted>
Date: Mon, 14 Dec 2015 18:32:56 +0000 (-0600)
Subject: minor bug fixes
X-Git-Url: https://jfr.im/git/erebus.git/commitdiff_plain/7631844f5bbb005b130cccc33d2dce9510c0f9df?ds=sidebyside

minor bug fixes
---

diff --git a/bot.py b/bot.py
index 5f9f26f..d7502ba 100644
--- 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 ef45b79..c03c980 100644
--- 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()