From 9b25bc524ff45dd2d839b5a43eb016e830e49855 Mon Sep 17 00:00:00 2001 From: Ryan Hitchman Date: Mon, 22 Feb 2010 16:49:30 -0700 Subject: [PATCH] typos~ --- bot.py | 2 +- core/irc.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bot.py b/bot.py index 473d15d..f3c3f62 100755 --- a/bot.py +++ b/bot.py @@ -58,8 +58,8 @@ while True: for conn in bot.conns.itervalues(): try: out = conn.out.get_nowait() + main(conn, out) except Queue.Empty: pass - main(conn, out) while all(conn.out.empty() for conn in bot.conns.itervalues()): time.sleep(.3) diff --git a/core/irc.py b/core/irc.py index 9c42759..6eac7f3 100644 --- a/core/irc.py +++ b/core/irc.py @@ -89,7 +89,7 @@ class crlf_ssl_tcp(crlf_tcp): def create_socket(self): return wrap_socket(crlf_tcp.create_socket(self), server_side=False, - cert_reqs = [CERT_NONE, CERT_REQUIRED][self.ignore_cert_errors]) + cert_reqs = [CERT_REQUIRED, CERT_NONE][self.ignore_cert_errors]) def recv_from_socket(self, nbytes): return self.socket.read(nbytes) @@ -229,7 +229,7 @@ class FakeIRC(IRC): class SSLIRC(IRC): def __init__(self, server, nick, port=6667, channels=[], conf={}, ignore_certificate_errors=True): - self.ignore_cert_errors = ignore_cert_errors + self.ignore_cert_errors = ignore_certificate_errors IRC.__init__(self, server, nick, port, channels, conf) def create_connection(self):