notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Support IPv6 connections"

Browse Source
This commit is contained in:
Ryan Schmidt 2015-12-04 17:48:26 -07:00
parent 81da5cb789
commit 609cb6e2a7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oyoyo/client.py
View File

@ -21,7 +21,6 @@ import sys
import threading import threading
import time import time
import traceback import traceback
import os
from oyoyo.parse import parse_raw_irc_command from oyoyo.parse import parse_raw_irc_command
@ -100,7 +99,7 @@ class IRCClient(object):
To enable blocking pass blocking=True. To enable blocking pass blocking=True.
""" """
self.socket = None self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.nickname = "" self.nickname = ""
self.hostmask = "" self.hostmask = ""
self.ident = "" self.ident = ""
@ -178,14 +177,13 @@ class IRCClient(object):
retries = 0 retries = 0
while True: while True:
try: try:
self.socket = socket.create_connection(("{0}".format(self.host), self.port)) self.socket.connect(("{0}".format(self.host), self.port))
break break
except socket.error as e: except socket.error as e:
retries += 1 retries += 1
self.stream_handler('Error: {0}'.format(e), level="warning") self.stream_handler('Error: {0}'.format(e), level="warning")
if retries > 3: if retries > 3:
exit(os.EX_UNAVAILABLE) break
if not self.blocking: if not self.blocking:
self.socket.setblocking(0) self.socket.setblocking(0)