Skip to content
Snippets Groups Projects
Commit aea4b8e8 authored by Svetlana Tkachenko's avatar Svetlana Tkachenko
Browse files

rewrite irc.py to remove redundant code repetition

parent 271def63
No related branches found
No related tags found
No related merge requests found
...@@ -172,24 +172,16 @@ class IRC(asynchat.async_chat): ...@@ -172,24 +172,16 @@ class IRC(asynchat.async_chat):
self.set_terminator(b"\r\n") self.set_terminator(b"\r\n")
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if self.config["use_ssl"].lower().startswith("y"): if self.config["use_ssl"].lower().startswith("y"):self.sock = ssl.wrap_socket(self.sock)
try: try:
self.ssl_sock = ssl.wrap_socket(self.sock) self.sock.connect((self.config["host"], int(self.config["port"])))
self.ssl_sock.connect((self.config["host"], int(self.config["port"]))) except ssl.SSLError as error:
self.set_socket(self.ssl_sock) self.prnt('SSL Error connecting to server. (Are you using the right port?) Error message: %s' % error)
except ssl.SSLError as error: return
self.prnt('SSL Error connecting to server. (Are you using the right port?) Error message: %s' % error) except socket.error as error:
return self.prnt('There was an error connecting to %s. %s' % (self.config["host"], error))
except socket.error as error: return
self.prnt('There was an error connecting to %s. %s' % (self.config["host"], error)) self.set_socket(self.sock)
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)
def _getData(self): def _getData(self):
ret = self.data ret = self.data
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment