python-socks 2.6.0__tar.gz → 2.6.1__tar.gz

{python_socks-2.6.0/python_socks.egg-info → python_socks-2.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-socks
-Version: 2.6.0
+Version: 2.6.1
 Summary: Proxy (SOCKS4, SOCKS5, HTTP CONNECT) client for Python
 Author-email: Roman Snegirev <snegiryev@gmail.com>
 License: Apache-2.0

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/_version.py

@@ -1,2 +1,2 @@
 __title__ = 'python-socks'
-__version__ = '2.6.0'
+__version__ = '2.6.1'

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/_proxy_chain.py

@@ -1,8 +1,14 @@
 from typing import Iterable
+import warnings
 
 
 class ProxyChain:
     def __init__(self, proxies: Iterable):
+        warnings.warn(
+            'This implementation of ProxyChain is deprecated and will be removed in the future',
+            DeprecationWarning,
+            stacklevel=2,
+        )
         self._proxies = proxies
 
     async def connect(self, dest_host, dest_port, timeout=None):
@@ -15,14 +21,14 @@ class ProxyChain:
                 dest_host=proxies[i + 1].proxy_host,
                 dest_port=proxies[i + 1].proxy_port,
                 timeout=timeout,
-                _socket=curr_socket
+                _socket=curr_socket,
             )
 
         curr_socket = await proxies[length].connect(
             dest_host=dest_host,
             dest_port=dest_port,
             timeout=timeout,
-            _socket=curr_socket
+            _socket=curr_socket,
         )
 
         return curr_socket

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/anyio/_chain.py

@@ -1,9 +1,15 @@
 from typing import Iterable
+import warnings
 from ._proxy import AnyioProxy
 
 
 class ProxyChain:
     def __init__(self, proxies: Iterable[AnyioProxy]):
+        warnings.warn(
+            'This implementation of ProxyChain is deprecated and will be removed in the future',
+            DeprecationWarning,
+            stacklevel=2,
+        )
         self._proxies = proxies
 
     async def connect(

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/anyio/_connect.py

@@ -1,3 +1,4 @@
+from typing import Optional
 import anyio
 import anyio.abc
 
@@ -5,7 +6,7 @@ import anyio.abc
 async def connect_tcp(
     host: str,
     port: int,
-    local_host: str = None,
+    local_host: Optional[str] = None,
 ) -> anyio.abc.SocketStream:
 
     return await anyio.connect_tcp(

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/anyio/_proxy.py

@@ -1,5 +1,6 @@
 import ssl
 from typing import Any, Optional
+import warnings
 
 import anyio
 
@@ -52,7 +53,14 @@ class AnyioProxy:
             timeout = DEFAULT_TIMEOUT
 
         _stream = kwargs.get('_stream')
-
+        if _stream is not None:
+            warnings.warn(
+                "The '_stream' argument is deprecated and will be removed in the future",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+
+        local_host = kwargs.get('local_host')
         try:
             with anyio.fail_after(timeout):
                 if _stream is None:
@@ -61,6 +69,7 @@ class AnyioProxy:
                             await connect_tcp(
                                 host=self._proxy_host,
                                 port=self._proxy_port,
+                                local_host=local_host,
                             )
                         )
                     except OSError as e:
@@ -123,6 +132,6 @@ class AnyioProxy:
         return cls(*args, **kwargs)
 
     @classmethod
-    def from_url(cls, url: str, **kwargs):
+    def from_url(cls, url: str, **kwargs) -> 'AnyioProxy':
         url_args = parse_proxy_url(url)
         return cls(*url_args, **kwargs)

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/anyio/v2/_chain.py

@@ -1,9 +1,15 @@
 from typing import Sequence
+import warnings
 from ._proxy import AnyioProxy
 
 
 class ProxyChain:
     def __init__(self, proxies: Sequence[AnyioProxy]):
+        warnings.warn(
+            'This implementation of ProxyChain is deprecated and will be removed in the future',
+            DeprecationWarning,
+            stacklevel=2,
+        )
         self._proxies = proxies
 
     async def connect(

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/anyio/v2/_connect.py

@@ -1,3 +1,4 @@
+from typing import Optional
 import anyio
 import anyio.abc
 from ._stream import AnyioSocketStream
@@ -6,7 +7,7 @@ from ._stream import AnyioSocketStream
 async def connect_tcp(
     host: str,
     port: int,
-    local_host: str = None,
+    local_host: Optional[str] = None,
 ) -> AnyioSocketStream:
     s = await anyio.connect_tcp(
         remote_host=host,

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/anyio/v2/_proxy.py

@@ -1,5 +1,5 @@
 import ssl
-from typing import Optional
+from typing import Any, Optional
 
 import anyio
 
@@ -47,33 +47,36 @@ class AnyioProxy:
         dest_port: int,
         dest_ssl: Optional[ssl.SSLContext] = None,
         timeout: Optional[float] = None,
+        **kwargs: Any,
     ) -> AnyioSocketStream:
         if timeout is None:
             timeout = DEFAULT_TIMEOUT
 
+        local_host = kwargs.get('local_host')
         try:
             with anyio.fail_after(timeout):
                 return await self._connect(
                     dest_host=dest_host,
                     dest_port=dest_port,
                     dest_ssl=dest_ssl,
+                    local_host=local_host,
                 )
         except TimeoutError as e:
-            raise ProxyTimeoutError(
-                'Proxy connection timed out: {}'.format(timeout)
-            ) from e
+            raise ProxyTimeoutError('Proxy connection timed out: {}'.format(timeout)) from e
 
     async def _connect(
         self,
         dest_host: str,
         dest_port: int,
         dest_ssl: Optional[ssl.SSLContext] = None,
+        local_host: Optional[str] = None,
     ) -> AnyioSocketStream:
         if self._forward is None:
             try:
                 stream = await connect_tcp(
                     host=self._proxy_host,
                     port=self._proxy_port,
+                    local_host=local_host,
                 )
             except OSError as e:
                 raise ProxyConnectionError(
@@ -127,6 +130,6 @@ class AnyioProxy:
         return cls(*args, **kwargs)
 
     @classmethod
-    def from_url(cls, url: str, **kwargs):
+    def from_url(cls, url: str, **kwargs) -> 'AnyioProxy':
         url_args = parse_proxy_url(url)
         return cls(*url_args, **kwargs)

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/asyncio/_connect.py

@@ -23,7 +23,7 @@ async def connect_tcp(
     if is_ipv6_address(host):
         address = (host, port, 0, 0)  # to fix OSError: [WinError 10022]
     else:
-        address = (host, port)
+        address = (host, port)  # type: ignore[assignment]
 
     await loop.sock_connect(sock=sock, address=address)
     return sock

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/asyncio/_proxy.py

@@ -2,6 +2,7 @@ import asyncio
 import socket
 import sys
 from typing import Any, Optional
+import warnings
 
 from ..._types import ProxyType
 from ..._helpers import parse_proxy_url
@@ -58,23 +59,39 @@ class AsyncioProxy:
             timeout = DEFAULT_TIMEOUT
 
         _socket = kwargs.get('_socket')
+        if _socket is not None:
+            warnings.warn(
+                "The '_socket' argument is deprecated and will be removed in the future",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+
+        local_addr = kwargs.get('local_addr')
         try:
             async with async_timeout.timeout(timeout):
                 return await self._connect(
                     dest_host=dest_host,
                     dest_port=dest_port,
                     _socket=_socket,
+                    local_addr=local_addr,
                 )
         except asyncio.TimeoutError as e:
             raise ProxyTimeoutError(f'Proxy connection timed out: {timeout}') from e
 
-    async def _connect(self, dest_host, dest_port, _socket=None) -> socket.socket:
+    async def _connect(
+        self,
+        dest_host,
+        dest_port,
+        _socket=None,
+        local_addr=None,
+    ) -> socket.socket:
         if _socket is None:
             try:
                 _socket = await connect_tcp(
                     host=self._proxy_host,
                     port=self._proxy_port,
                     loop=self._loop,
+                    local_addr=local_addr,
                 )
             except OSError as e:
                 msg = 'Could not connect to proxy {}:{} [{}]'.format(
@@ -101,42 +118,13 @@ class AsyncioProxy:
             )
 
             return _socket
-        except asyncio.CancelledError:  # pragma: no cover
-            # https://bugs.python.org/issue30064
-            # https://bugs.python.org/issue34795
-            if self._can_be_closed_safely():
-                await stream.close()
-            raise
         except ReplyError as e:
             await stream.close()
             raise ProxyError(e, error_code=e.error_code)
-        except Exception:  # pragma: no cover
+        except (asyncio.CancelledError, Exception):  # pragma: no cover
             await stream.close()
             raise
 
-    def _can_be_closed_safely(self):  # pragma: no cover
-        def is_proactor_event_loop():
-            try:
-                # pylint:disable-next=import-outside-toplevel
-                from asyncio import ProactorEventLoop
-            except ImportError:
-                return False
-            return isinstance(self._loop, ProactorEventLoop)
-
-        def is_uvloop_event_loop():
-            try:
-                # pylint:disable-next=import-outside-toplevel
-                from uvloop import Loop  # type:ignore[import-not-found]
-            except ImportError:
-                return False
-            return isinstance(self._loop, Loop)
-
-        return (
-            sys.version_info[:2] >= (3, 8)
-            or is_proactor_event_loop()
-            or is_uvloop_event_loop()
-        )
-
     @property
     def proxy_host(self):
         return self._proxy_host
@@ -150,6 +138,6 @@ class AsyncioProxy:
         return cls(*args, **kwargs)
 
     @classmethod
-    def from_url(cls, url: str, **kwargs):
+    def from_url(cls, url: str, **kwargs) -> 'AsyncioProxy':
         url_args = parse_proxy_url(url)
         return cls(*url_args, **kwargs)

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/asyncio/v2/_chain.py

@@ -1,9 +1,15 @@
 from typing import Sequence
+import warnings
 from ._proxy import AsyncioProxy
 
 
 class ProxyChain:
     def __init__(self, proxies: Sequence[AsyncioProxy]):
+        warnings.warn(
+            'This implementation of ProxyChain is deprecated and will be removed in the future',
+            DeprecationWarning,
+            stacklevel=2,
+        )
         self._proxies = proxies
 
     async def connect(

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/asyncio/v2/_connect.py

@@ -16,7 +16,7 @@ async def connect_tcp(
     reader, writer = await asyncio.open_connection(
         host=host,
         port=port,
-        **kwargs,
+        **kwargs,  # type: ignore
     )
 
     return AsyncioSocketStream(

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/asyncio/v2/_proxy.py

@@ -1,6 +1,6 @@
 import asyncio
 import ssl
-from typing import Optional
+from typing import Any, Optional, Tuple
 import warnings
 import sys
 
@@ -68,27 +68,29 @@ class AsyncioProxy:
         dest_port: int,
         dest_ssl: Optional[ssl.SSLContext] = None,
         timeout: Optional[float] = None,
+        **kwargs: Any,
     ) -> AsyncioSocketStream:
         if timeout is None:
             timeout = DEFAULT_TIMEOUT
 
+        local_addr = kwargs.get('local_addr')
         try:
             async with async_timeout.timeout(timeout):
                 return await self._connect(
                     dest_host=dest_host,
                     dest_port=dest_port,
                     dest_ssl=dest_ssl,
+                    local_addr=local_addr,
                 )
         except asyncio.TimeoutError as e:
-            raise ProxyTimeoutError(
-                'Proxy connection timed out: {}'.format(timeout)
-            ) from e
+            raise ProxyTimeoutError('Proxy connection timed out: {}'.format(timeout)) from e
 
     async def _connect(
         self,
         dest_host: str,
         dest_port: int,
         dest_ssl: Optional[ssl.SSLContext] = None,
+        local_addr: Optional[Tuple[str, int]] = None,
     ) -> AsyncioSocketStream:
         if self._forward is None:
             try:
@@ -96,6 +98,7 @@ class AsyncioProxy:
                     host=self._proxy_host,
                     port=self._proxy_port,
                     loop=self._loop,
+                    local_addr=local_addr,
                 )
             except OSError as e:
                 raise ProxyConnectionError(
@@ -149,6 +152,6 @@ class AsyncioProxy:
         return cls(*args, **kwargs)
 
     @classmethod
-    def from_url(cls, url: str, **kwargs):
+    def from_url(cls, url: str, **kwargs) -> 'AsyncioProxy':
         url_args = parse_proxy_url(url)
         return cls(*url_args, **kwargs)

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/asyncio/v2/_stream.py

@@ -6,48 +6,10 @@ from .... import _abc as abc
 DEFAULT_RECEIVE_SIZE = 65536
 
 
-# noinspection PyUnusedLocal
-async def backport_start_tls(
-    transport,
-    protocol,
-    ssl_context,
-    *,
-    server_side=False,
-    server_hostname=None,
-    ssl_handshake_timeout=None,
-):  # pragma: no cover
-    """
-    Python 3.6 asyncio doesn't have a start_tls() method on the loop,
-    so we use this function in place of the loop's start_tls() method.
-    Adapted from this comment:
-    https://github.com/urllib3/urllib3/issues/1323#issuecomment-362494839
-    """
-    import asyncio.sslproto
-
-    loop = asyncio.get_event_loop()
-    waiter = loop.create_future()
-    ssl_protocol = asyncio.sslproto.SSLProtocol(
-        loop,
-        protocol,
-        ssl_context,
-        waiter,
-        server_side=False,
-        server_hostname=server_hostname,
-        call_connection_made=False,
-    )
-
-    transport.set_protocol(ssl_protocol)
-    loop.call_soon(ssl_protocol.connection_made, transport)
-    loop.call_soon(transport.resume_reading)  # type: ignore
-
-    await waiter
-    return ssl_protocol._app_transport  # noqa
-
-
 class AsyncioSocketStream(abc.AsyncSocketStream):
-    _loop: asyncio.AbstractEventLoop = None
-    _reader: asyncio.StreamReader = None
-    _writer: asyncio.StreamWriter = None
+    _loop: asyncio.AbstractEventLoop
+    _reader: asyncio.StreamReader
+    _writer: asyncio.StreamWriter
 
     def __init__(
         self,
@@ -86,9 +48,7 @@ class AsyncioSocketStream(abc.AsyncSocketStream):
         reader = asyncio.StreamReader()
         protocol = asyncio.StreamReaderProtocol(reader)
 
-        loop_start_tls = getattr(self._loop, 'start_tls', backport_start_tls)
-
-        transport = await loop_start_tls(
+        transport: asyncio.Transport = await self._loop.start_tls(
             self._writer.transport,  # type: ignore
             protocol,
             ssl_context,
@@ -115,7 +75,7 @@ class AsyncioSocketStream(abc.AsyncSocketStream):
         # When we return a new SocketStream with new StreamReader/StreamWriter instances
         # we need to keep references to the old StreamReader/StreamWriter so that they
         # are not garbage collected and closed while we're still using them.
-        stream._inner = self  # type: ignore
+        stream._inner = self  # type: ignore # pylint:disable=W0212,W0201
         return stream
 
     async def close(self):

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/curio/_proxy.py

@@ -1,4 +1,5 @@
 from typing import Any, Optional
+import warnings
 import curio
 import curio.io
 
@@ -47,7 +48,14 @@ class CurioProxy:
             timeout = DEFAULT_TIMEOUT
 
         _socket = kwargs.get('_socket')
+        if _socket is not None:
+            warnings.warn(
+                "The '_socket' argument is deprecated and will be removed in the future",
+                DeprecationWarning,
+                stacklevel=2,
+            )
 
+        local_addr = kwargs.get('local_addr')
         try:
             return await curio.timeout_after(
                 timeout,
@@ -55,6 +63,7 @@ class CurioProxy:
                 dest_host,
                 dest_port,
                 _socket,
+                local_addr,
             )
         except curio.TaskTimeout as e:
             raise ProxyTimeoutError(f'Proxy connection timed out: {timeout}') from e
@@ -64,12 +73,14 @@ class CurioProxy:
         dest_host: str,
         dest_port: int,
         _socket=None,
+        local_addr=None,
     ):
         if _socket is None:
             try:
                 _socket = await connect_tcp(
                     host=self._proxy_host,
                     port=self._proxy_port,
+                    local_addr=local_addr,
                 )
             except OSError as e:
                 msg = 'Could not connect to proxy {}:{} [{}]'.format(
@@ -116,6 +127,6 @@ class CurioProxy:
         return cls(*args, **kwargs)
 
     @classmethod
-    def from_url(cls, url: str, **kwargs):
+    def from_url(cls, url: str, **kwargs) -> 'CurioProxy':
         url_args = parse_proxy_url(url)
         return cls(*url_args, **kwargs)

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/trio/_proxy.py

@@ -1,4 +1,5 @@
 from typing import Any, Optional
+import warnings
 import trio
 
 from ..._types import ProxyType
@@ -46,30 +47,38 @@ class TrioProxy:
             timeout = DEFAULT_TIMEOUT
 
         _socket = kwargs.get('_socket')
+        if _socket is not None:
+            warnings.warn(
+                "The '_socket' argument is deprecated and will be removed in the future",
+                DeprecationWarning,
+                stacklevel=2,
+            )
 
+        local_addr = kwargs.get('local_addr')
         try:
             with trio.fail_after(timeout):
                 return await self._connect(
                     dest_host=dest_host,
                     dest_port=dest_port,
                     _socket=_socket,
+                    local_addr=local_addr,
                 )
         except trio.TooSlowError as e:
-            raise ProxyTimeoutError(
-                'Proxy connection timed out: {}'.format(timeout)
-            ) from e
+            raise ProxyTimeoutError('Proxy connection timed out: {}'.format(timeout)) from e
 
     async def _connect(
         self,
         dest_host: str,
         dest_port: int,
         _socket=None,
+        local_addr=None,
     ) -> trio.socket.SocketType:
         if _socket is None:
             try:
                 _socket = await connect_tcp(
                     host=self._proxy_host,
                     port=self._proxy_port,
+                    local_addr=local_addr,
                 )
             except OSError as e:
                 msg = 'Could not connect to proxy {}:{} [{}]'.format(
@@ -117,6 +126,6 @@ class TrioProxy:
         return cls(*args, **kwargs)
 
     @classmethod
-    def from_url(cls, url: str, **kwargs):
+    def from_url(cls, url: str, **kwargs) -> 'TrioProxy':
         url_args = parse_proxy_url(url)
         return cls(*url_args, **kwargs)

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/trio/v2/_chain.py

@@ -1,9 +1,15 @@
 from typing import Sequence
+import warnings
 from ._proxy import TrioProxy
 
 
 class ProxyChain:
     def __init__(self, proxies: Sequence[TrioProxy]):
+        warnings.warn(
+            'This implementation of ProxyChain is deprecated and will be removed in the future',
+            DeprecationWarning,
+            stacklevel=2,
+        )
         self._proxies = proxies
 
     async def connect(

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/trio/v2/_connect.py

@@ -1,4 +1,4 @@
-from typing import Optional, Tuple
+from typing import Optional
 
 import trio
 from ._stream import TrioSocketStream
@@ -7,7 +7,7 @@ from ._stream import TrioSocketStream
 async def connect_tcp(
     host: str,
     port: int,
-    local_addr: Optional[Tuple[str, int]] = None,
+    local_addr: Optional[str] = None,
 ) -> TrioSocketStream:
     trio_stream = await trio.open_tcp_stream(
         host=host,

{python_socks-2.6.0 → python_socks-2.6.1}/python_socks/async_/trio/v2/_proxy.py

@@ -1,5 +1,5 @@
 import ssl
-from typing import Optional
+from typing import Any, Optional
 
 import trio
 
@@ -47,16 +47,19 @@ class TrioProxy:
         dest_port: int,
         dest_ssl: Optional[ssl.SSLContext] = None,
         timeout: Optional[float] = None,
+        **kwargs: Any,
     ) -> TrioSocketStream:
         if timeout is None:
             timeout = DEFAULT_TIMEOUT
 
+        local_addr = kwargs.get('local_addr')
         try:
             with trio.fail_after(timeout):
                 return await self._connect(
                     dest_host=dest_host,
                     dest_port=dest_port,
                     dest_ssl=dest_ssl,
+                    local_addr=local_addr,
                 )
         except trio.TooSlowError as e:
             raise ProxyTimeoutError(f'Proxy connection timed out: {timeout}') from e
@@ -66,12 +69,14 @@ class TrioProxy:
         dest_host: str,
         dest_port: int,
         dest_ssl: Optional[ssl.SSLContext] = None,
+        local_addr: Optional[str] = None,
     ) -> TrioSocketStream:
         if self._forward is None:
             try:
                 stream = await connect_tcp(
                     host=self._proxy_host,
                     port=self._proxy_port,
+                    local_addr=local_addr,
                 )
             except OSError as e:
                 raise ProxyConnectionError(
@@ -125,6 +130,6 @@ class TrioProxy:
         return cls(*args, **kwargs)
 
     @classmethod
-    def from_url(cls, url: str, **kwargs):
+    def from_url(cls, url: str, **kwargs) -> 'TrioProxy':
         url_args = parse_proxy_url(url)
         return cls(*url_args, **kwargs)