Merge 0a91aa6e173e290450a9391a0cf9a730e0190b69 into 0e3db9f769deffb02b61f80ac990260b260f8517

This commit is contained in:
HarHar 2013-01-25 12:42:23 -08:00
commit d38369ad7a

View File

@ -76,7 +76,7 @@ class Bot(object):
try: try:
self.sock.send(s.encode('utf8') + '\r\n') self.sock.send(s.encode('utf8') + '\r\n')
except socket.error, info: except socket.error, info:
bot.active = False self.active = False
print '\033[91mSocket error (bot disconnected)\033[0;0m ' + str(info) print '\033[91mSocket error (bot disconnected)\033[0;0m ' + str(info)
break break
def msg(self, who, message): def msg(self, who, message):
@ -146,7 +146,7 @@ class Bot(object):
out += u['file'] out += u['file']
break break
else: else:
out += '[no file]' out += '[no file]'
self.msg(to, out) self.msg(to, out)
out = 'Users: ' out = 'Users: '
i = 0 i = 0