From b08c0a46a96cb735d9c74b81d0ea7dc0e22cfdad Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Thu, 3 Oct 2013 16:26:08 +1300 Subject: [PATCH] SSL works again! --- core/irc.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/irc.py b/core/irc.py index 256dc52..ef6c31c 100755 --- a/core/irc.py +++ b/core/irc.py @@ -215,8 +215,8 @@ class IRC(object): self.input_queue = Queue.Queue() self.output_queue = Queue.Queue() - self.connection = Connection(self.name, self.server, self.port, - self.input_queue, self.output_queue) + # create the IRC connection and connect + self.connection = self.create_connection() self.connection.connect() self.set_pass(self.conf.get('server_password')) @@ -230,6 +230,9 @@ class IRC(object): self.parse_thread.daemon = True self.parse_thread.start() + def create_connection(self): + return Connection(self.name, self.server, self.port, + self.input_queue, self.output_queue) def stop(self): self.connection.stop() @@ -281,4 +284,5 @@ class SSLIRC(IRC): IRC.__init__(self, name, server, nick, port, channels, conf) def create_connection(self): - return crlf_ssl_tcp(self.name, self.server, self.port, self.ignore_cert_errors) + return SSLConnection(self.name, self.server, self.port, self.input_queue, + self.output_queue, self.ignore_cert_errors)