diff --git a/irc.py b/irc.py index 4b45b67fc0884263d9e42cfc02fc65e67325b40e..4b3b34c75e5252bd537ab073ee93645ace6e3403 100644 --- a/irc.py +++ b/irc.py @@ -172,24 +172,16 @@ class IRC(asynchat.async_chat): self.set_terminator(b"\r\n") self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - if self.config["use_ssl"].lower().startswith("y"): - try: - self.ssl_sock = ssl.wrap_socket(self.sock) - self.ssl_sock.connect((self.config["host"], int(self.config["port"]))) - self.set_socket(self.ssl_sock) - except ssl.SSLError as error: - self.prnt('SSL Error connecting to server. (Are you using the right port?) Error message: %s' % error) - return - except socket.error as error: - self.prnt('There was an error connecting to %s. %s' % (self.config["host"], error)) - return - else: - try: - self.sock.connect((self.config["host"], int(self.config["port"]))) - except socket.error as error: - self.prnt('There was an error connecting to %s. %s' % (self.config["host"],error)) - return - self.set_socket(self.sock) + if self.config["use_ssl"].lower().startswith("y"):self.sock = ssl.wrap_socket(self.sock) + try: + self.sock.connect((self.config["host"], int(self.config["port"]))) + except ssl.SSLError as error: + self.prnt('SSL Error connecting to server. (Are you using the right port?) Error message: %s' % error) + return + except socket.error as error: + self.prnt('There was an error connecting to %s. %s' % (self.config["host"], error)) + return + self.set_socket(self.sock) def _getData(self): ret = self.data