From aea4b8e8f8361f1070357872c1e508d4cb3a6d10 Mon Sep 17 00:00:00 2001
From: gry <guppy@123mail.org>
Date: Fri, 19 Oct 2012 22:50:21 +1030
Subject: [PATCH] rewrite irc.py to remove redundant code repetition
---
irc.py | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/irc.py b/irc.py
index 4b45b67..4b3b34c 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
--
GitLab