From f824f836cf449118e3e1167794cb2ad6fd660f58 Mon Sep 17 00:00:00 2001 From: Daniel Roethlisberger Date: Tue, 19 Nov 2024 15:41:46 +0100 Subject: [PATCH] Fixes for Python 3.12 --- torpy/cell_socket.py | 5 ++--- torpy/http/adapter.py | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/torpy/cell_socket.py b/torpy/cell_socket.py index 33d6924..9fd8b3d 100644 --- a/torpy/cell_socket.py +++ b/torpy/cell_socket.py @@ -54,9 +54,8 @@ def connect(self): if self._socket: raise Exception('Already connected') - self._socket = ssl.wrap_socket( - socket.socket(socket.AF_INET, socket.SOCK_STREAM), ssl_version=ssl.PROTOCOL_TLSv1_2 - ) + context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) + self._socket = context.wrap_socket(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) logger.debug('Connecting socket to %s relay...', self._router) try: self._socket.settimeout(15.0) diff --git a/torpy/http/adapter.py b/torpy/http/adapter.py index b8763bd..38fbb91 100644 --- a/torpy/http/adapter.py +++ b/torpy/http/adapter.py @@ -43,7 +43,7 @@ def init_poolmanager(self, connections, maxsize, block=DEFAULT_POOLBLOCK, **pool self._pool_block = block self.poolmanager = MyPoolManager( - self._tor_info, num_pools=connections, maxsize=maxsize, block=block, strict=True, **pool_kwargs + self._tor_info, num_pools=connections, maxsize=maxsize, block=block, **pool_kwargs ) @@ -85,7 +85,6 @@ def _new_conn(self): host=self.host, port=self.port, timeout=self.timeout.connect_timeout, - strict=self.strict, **self.conn_kw, ) @@ -104,7 +103,6 @@ def _new_conn(self): host=self.host, port=self.port, timeout=self.timeout.connect_timeout, - strict=self.strict, **self.conn_kw, ) logger.debug('[MyHTTPSConnectionPool] preparing...')