From 609cb6e2a731f5f59b2ba666adca81c7070fa163 Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Fri, 4 Dec 2015 17:48:26 -0700 Subject: [PATCH] Revert "Support IPv6 connections" --- oyoyo/client.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/oyoyo/client.py b/oyoyo/client.py index 2ad431c..c550456 100644 --- a/oyoyo/client.py +++ b/oyoyo/client.py @@ -21,7 +21,6 @@ import sys import threading import time import traceback -import os from oyoyo.parse import parse_raw_irc_command @@ -100,7 +99,7 @@ class IRCClient(object): To enable blocking pass blocking=True. """ - self.socket = None + self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.nickname = "" self.hostmask = "" self.ident = "" @@ -178,14 +177,13 @@ class IRCClient(object): retries = 0 while True: try: - self.socket = socket.create_connection(("{0}".format(self.host), self.port)) + self.socket.connect(("{0}".format(self.host), self.port)) break except socket.error as e: retries += 1 self.stream_handler('Error: {0}'.format(e), level="warning") if retries > 3: - exit(os.EX_UNAVAILABLE) - + break if not self.blocking: self.socket.setblocking(0)