Fix creating new connections accessing invalid attributes

This commit is contained in:
Lonami Exo
2017-09-22 16:11:07 +02:00
parent bfa3001f87
commit b0f6b23e52
3 changed files with 8 additions and 7 deletions

View File

@@ -8,7 +8,7 @@ from threading import Lock
class TcpClient:
def __init__(self, proxy=None, timeout=timedelta(seconds=5)):
self._proxy = proxy
self.proxy = proxy
self._socket = None
self._closing_lock = Lock()
@@ -20,15 +20,15 @@ class TcpClient:
raise ValueError('Invalid timeout type', type(timeout))
def _recreate_socket(self, mode):
if self._proxy is None:
if self.proxy is None:
self._socket = socket.socket(mode, socket.SOCK_STREAM)
else:
import socks
self._socket = socks.socksocket(mode, socket.SOCK_STREAM)
if type(self._proxy) is dict:
self._socket.set_proxy(**self._proxy)
if type(self.proxy) is dict:
self._socket.set_proxy(**self.proxy)
else: # tuple, list, etc.
self._socket.set_proxy(*self._proxy)
self._socket.set_proxy(*self.proxy)
self._socket.settimeout(self.timeout)