python-socks 3.1.0__tar.gz → 3.2.0__tar.gz

{python_socks-3.1.0/python_socks.egg-info → python_socks-3.2.0}/PKG-INFO

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

{python_socks-3.1.0 → python_socks-3.2.0}/python_socks/_protocols/http.py

@@ -104,7 +104,7 @@ class ConnectRequest:
         buff.append_line(f"Host: {host}:{self.port}")
         buff.append_line(f"User-Agent: {DEFAULT_USER_AGENT}")
 
-        if self.username and self.password:
+        if self.username and self.password is not None:
             auth = BasicAuth(self.username, self.password)
             buff.append_line(f"Proxy-Authorization: {auth.encode()}")
 

{python_socks-3.1.0 → python_socks-3.2.0}/python_socks/_version.py

@@ -1,2 +1,2 @@
 __title__ = "python-socks"
-__version__ = "3.1.0"
+__version__ = "3.2.0"

{python_socks-3.1.0 → python_socks-3.2.0}/python_socks/async_/asyncio/v2/_stream.py

@@ -80,7 +80,7 @@ class AsyncioSocketStream(abc.AsyncSocketStream):
         self._writer.close()
         try:
             await self._writer.wait_closed()
-        except OSError:
+        except Exception:  # noqa: BLE001, S110
             pass
         self._writer.transport.abort()
 

{python_socks-3.1.0 → python_socks-3.2.0/python_socks.egg-info}/PKG-INFO

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

python_socks-3.2.0/python_socks.egg-info/SOURCES.txt

@@ -0,0 +1,88 @@
+LICENSE.txt
+MANIFEST.in
+README.md
+pyproject.toml
+python_socks/__init__.py
+python_socks/_abc.py
+python_socks/_errors.py
+python_socks/_helpers.py
+python_socks/_types.py
+python_socks/_version.py
+python_socks/py.typed
+python_socks.egg-info/PKG-INFO
+python_socks.egg-info/SOURCES.txt
+python_socks.egg-info/dependency_links.txt
+python_socks.egg-info/requires.txt
+python_socks.egg-info/top_level.txt
+python_socks/_connectors/__init__.py
+python_socks/_connectors/abc.py
+python_socks/_connectors/factory_async.py
+python_socks/_connectors/factory_sync.py
+python_socks/_connectors/http_async.py
+python_socks/_connectors/http_sync.py
+python_socks/_connectors/socks4_async.py
+python_socks/_connectors/socks4_sync.py
+python_socks/_connectors/socks5_async.py
+python_socks/_connectors/socks5_sync.py
+python_socks/_protocols/__init__.py
+python_socks/_protocols/errors.py
+python_socks/_protocols/http.py
+python_socks/_protocols/socks4.py
+python_socks/_protocols/socks5.py
+python_socks/async_/__init__.py
+python_socks/async_/anyio/__init__.py
+python_socks/async_/anyio/_connect.py
+python_socks/async_/anyio/_proxy.py
+python_socks/async_/anyio/_resolver.py
+python_socks/async_/anyio/_stream.py
+python_socks/async_/anyio/v2/__init__.py
+python_socks/async_/anyio/v2/_connect.py
+python_socks/async_/anyio/v2/_proxy.py
+python_socks/async_/anyio/v2/_stream.py
+python_socks/async_/asyncio/__init__.py
+python_socks/async_/asyncio/_connect.py
+python_socks/async_/asyncio/_proxy.py
+python_socks/async_/asyncio/_resolver.py
+python_socks/async_/asyncio/_stream.py
+python_socks/async_/asyncio/v2/__init__.py
+python_socks/async_/asyncio/v2/_connect.py
+python_socks/async_/asyncio/v2/_proxy.py
+python_socks/async_/asyncio/v2/_stream.py
+python_socks/async_/trio/__init__.py
+python_socks/async_/trio/_connect.py
+python_socks/async_/trio/_proxy.py
+python_socks/async_/trio/_resolver.py
+python_socks/async_/trio/_stream.py
+python_socks/async_/trio/v2/__init__.py
+python_socks/async_/trio/v2/_connect.py
+python_socks/async_/trio/v2/_proxy.py
+python_socks/async_/trio/v2/_stream.py
+python_socks/sync/__init__.py
+python_socks/sync/_connect.py
+python_socks/sync/_proxy.py
+python_socks/sync/_resolver.py
+python_socks/sync/_stream.py
+python_socks/sync/v2/__init__.py
+python_socks/sync/v2/_connect.py
+python_socks/sync/v2/_proxy.py
+python_socks/sync/v2/_ssl_transport.py
+python_socks/sync/v2/_stream.py
+tests/__init__.py
+tests/config.py
+tests/conftest.py
+tests/http_app.py
+tests/http_server.py
+tests/mocks.py
+tests/patches.py
+tests/proxy_server.py
+tests/test_misc.py
+tests/test_proxy_async_aio.py
+tests/test_proxy_async_aio_v2.py
+tests/test_proxy_async_anyio.py
+tests/test_proxy_async_anyio_v2.py
+tests/test_proxy_async_trio.py
+tests/test_proxy_async_trio_v2.py
+tests/test_proxy_sync.py
+tests/test_proxy_sync_v2.py
+tests/test_resolvers.py
+tests/utils.py

{python_socks-3.1.0 → python_socks-3.2.0}/tests/test_misc.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from python_socks._helpers import is_ip_address
@@ -56,3 +58,27 @@ def test_connect_request_does_not_bracket_hostname() -> None:
     raw = req.dumps()
     assert raw.split(b"\r\n", 1)[0] == b"CONNECT example.com:443 HTTP/1.1"
     assert b"Host: example.com:443\r\n" in raw
+
+
+@pytest.mark.parametrize(
+    ("username", "password", "expected"),
+    (
+        ("login", "", b"Basic bG9naW46"),
+        ("login", "password", b"Basic bG9naW46cGFzc3dvcmQ="),
+        ("login", None, None),
+        (None, None, None),
+        ("", "", None),
+    ),
+)
+def test_http_connect_request_authentication(
+    username: str | None, password: str | None, expected: bytes | None
+) -> None:
+    request = ConnectRequest(
+        host="example.com", port=443, username=username, password=password
+    )
+    headers = request.dumps().split(b"\r\n")
+    auth_headers = [line for line in headers if line.startswith(b"Proxy-Authorization:")]
+    if expected is None:
+        assert auth_headers == []
+    else:
+        assert auth_headers == [b"Proxy-Authorization: " + expected]

python_socks-3.1.0/python_socks.egg-info/SOURCES.txt

@@ -1,208 +0,0 @@
-LICENSE.txt
-MANIFEST.in
-README.md
-pyproject.toml
-python_socks/__init__.py
-python_socks/_abc.py
-python_socks/_errors.py
-python_socks/_helpers.py
-python_socks/_types.py
-python_socks/_version.py
-python_socks/py.typed
-python_socks.egg-info/PKG-INFO
-python_socks.egg-info/SOURCES.txt
-python_socks.egg-info/dependency_links.txt
-python_socks.egg-info/requires.txt
-python_socks.egg-info/top_level.txt
-python_socks/_connectors/__init__.py
-python_socks/_connectors/abc.py
-python_socks/_connectors/factory_async.py
-python_socks/_connectors/factory_sync.py
-python_socks/_connectors/http_async.py
-python_socks/_connectors/http_sync.py
-python_socks/_connectors/socks4_async.py
-python_socks/_connectors/socks4_sync.py
-python_socks/_connectors/socks5_async.py
-python_socks/_connectors/socks5_sync.py
-python_socks/_protocols/__init__.py
-python_socks/_protocols/errors.py
-python_socks/_protocols/http.py
-python_socks/_protocols/socks4.py
-python_socks/_protocols/socks5.py
-python_socks/async_/__init__.py
-python_socks/async_/anyio/__init__.py
-python_socks/async_/anyio/_connect.py
-python_socks/async_/anyio/_proxy.py
-python_socks/async_/anyio/_resolver.py
-python_socks/async_/anyio/_stream.py
-python_socks/async_/anyio/v2/__init__.py
-python_socks/async_/anyio/v2/_connect.py
-python_socks/async_/anyio/v2/_proxy.py
-python_socks/async_/anyio/v2/_stream.py
-python_socks/async_/asyncio/__init__.py
-python_socks/async_/asyncio/_connect.py
-python_socks/async_/asyncio/_proxy.py
-python_socks/async_/asyncio/_resolver.py
-python_socks/async_/asyncio/_stream.py
-python_socks/async_/asyncio/v2/__init__.py
-python_socks/async_/asyncio/v2/_connect.py
-python_socks/async_/asyncio/v2/_proxy.py
-python_socks/async_/asyncio/v2/_stream.py
-python_socks/async_/trio/__init__.py
-python_socks/async_/trio/_connect.py
-python_socks/async_/trio/_proxy.py
-python_socks/async_/trio/_resolver.py
-python_socks/async_/trio/_stream.py
-python_socks/async_/trio/v2/__init__.py
-python_socks/async_/trio/v2/_connect.py
-python_socks/async_/trio/v2/_proxy.py
-python_socks/async_/trio/v2/_stream.py
-python_socks/sync/__init__.py
-python_socks/sync/_connect.py
-python_socks/sync/_proxy.py
-python_socks/sync/_resolver.py
-python_socks/sync/_stream.py
-python_socks/sync/v2/__init__.py
-python_socks/sync/v2/_connect.py
-python_socks/sync/v2/_proxy.py
-python_socks/sync/v2/_ssl_transport.py
-python_socks/sync/v2/_stream.py
-tests/__init__.py
-tests/config.py
-tests/conftest.py
-tests/http_app.py
-tests/http_server.py
-tests/mocks.py
-tests/patches.py
-tests/proxy_server.py
-tests/test_misc.py
-tests/test_proxy_async_aio.py
-tests/test_proxy_async_aio_v2.py
-tests/test_proxy_async_anyio.py
-tests/test_proxy_async_anyio_v2.py
-tests/test_proxy_async_trio.py
-tests/test_proxy_async_trio_v2.py
-tests/test_proxy_sync.py
-tests/test_proxy_sync_v2.py
-tests/test_resolvers.py
-tests/utils.py
-tests/__pycache__/__init__.cpython-310.pyc
-tests/__pycache__/__init__.cpython-311.pyc
-tests/__pycache__/__init__.cpython-312.pyc
-tests/__pycache__/__init__.cpython-313.pyc
-tests/__pycache__/__init__.cpython-314.pyc
-tests/__pycache__/__init__.cpython-39.pyc
-tests/__pycache__/config.cpython-310.pyc
-tests/__pycache__/config.cpython-311.pyc
-tests/__pycache__/config.cpython-312.pyc
-tests/__pycache__/config.cpython-313.pyc
-tests/__pycache__/config.cpython-314.pyc
-tests/__pycache__/config.cpython-39.pyc
-tests/__pycache__/conftest.cpython-310-pytest-9.1.1.pyc
-tests/__pycache__/conftest.cpython-311-pytest-9.1.1.pyc
-tests/__pycache__/conftest.cpython-312-pytest-9.1.1.pyc
-tests/__pycache__/conftest.cpython-313-pytest-9.1.1.pyc
-tests/__pycache__/conftest.cpython-314-pytest-9.1.1.pyc
-tests/__pycache__/conftest.cpython-39-pytest-8.4.2.pyc
-tests/__pycache__/http_app.cpython-310.pyc
-tests/__pycache__/http_app.cpython-311.pyc
-tests/__pycache__/http_app.cpython-312.pyc
-tests/__pycache__/http_app.cpython-313.pyc
-tests/__pycache__/http_app.cpython-314.pyc
-tests/__pycache__/http_app.cpython-39.pyc
-tests/__pycache__/http_app2.cpython-314.pyc
-tests/__pycache__/http_app2.cpython-39.pyc
-tests/__pycache__/http_server.cpython-310.pyc
-tests/__pycache__/http_server.cpython-311.pyc
-tests/__pycache__/http_server.cpython-312.pyc
-tests/__pycache__/http_server.cpython-313.pyc
-tests/__pycache__/http_server.cpython-314.pyc
-tests/__pycache__/http_server.cpython-39.pyc
-tests/__pycache__/http_server2.cpython-314.pyc
-tests/__pycache__/http_server2.cpython-39.pyc
-tests/__pycache__/mocks.cpython-310.pyc
-tests/__pycache__/mocks.cpython-311.pyc
-tests/__pycache__/mocks.cpython-312.pyc
-tests/__pycache__/mocks.cpython-313.pyc
-tests/__pycache__/mocks.cpython-314.pyc
-tests/__pycache__/mocks.cpython-39.pyc
-tests/__pycache__/patches.cpython-310.pyc
-tests/__pycache__/patches.cpython-311.pyc
-tests/__pycache__/patches.cpython-312.pyc
-tests/__pycache__/patches.cpython-313.pyc
-tests/__pycache__/patches.cpython-314.pyc
-tests/__pycache__/patches.cpython-39.pyc
-tests/__pycache__/proxy_server.cpython-310.pyc
-tests/__pycache__/proxy_server.cpython-311.pyc
-tests/__pycache__/proxy_server.cpython-312.pyc
-tests/__pycache__/proxy_server.cpython-313.pyc
-tests/__pycache__/proxy_server.cpython-314.pyc
-tests/__pycache__/proxy_server.cpython-39.pyc
-tests/__pycache__/proxy_server2.cpython-314.pyc
-tests/__pycache__/proxy_server2.cpython-39.pyc
-tests/__pycache__/test_misc.cpython-310-pytest-9.1.1.pyc
-tests/__pycache__/test_misc.cpython-311-pytest-9.1.1.pyc
-tests/__pycache__/test_misc.cpython-312-pytest-9.1.1.pyc
-tests/__pycache__/test_misc.cpython-313-pytest-9.1.1.pyc
-tests/__pycache__/test_misc.cpython-314-pytest-9.1.1.pyc
-tests/__pycache__/test_misc.cpython-39-pytest-8.4.2.pyc
-tests/__pycache__/test_proxy_async_aio.cpython-310-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_aio.cpython-311-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_aio.cpython-312-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_aio.cpython-313-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_aio.cpython-314-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_aio.cpython-39-pytest-8.4.2.pyc
-tests/__pycache__/test_proxy_async_aio_v2.cpython-310-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_aio_v2.cpython-311-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_aio_v2.cpython-312-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_aio_v2.cpython-313-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_aio_v2.cpython-314-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_aio_v2.cpython-39-pytest-8.4.2.pyc
-tests/__pycache__/test_proxy_async_anyio.cpython-310-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_anyio.cpython-311-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_anyio.cpython-312-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_anyio.cpython-313-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_anyio.cpython-314-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_anyio.cpython-39-pytest-8.4.2.pyc
-tests/__pycache__/test_proxy_async_anyio_v2.cpython-310-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_anyio_v2.cpython-311-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_anyio_v2.cpython-312-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_anyio_v2.cpython-313-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_anyio_v2.cpython-314-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_anyio_v2.cpython-39-pytest-8.4.2.pyc
-tests/__pycache__/test_proxy_async_trio.cpython-310-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_trio.cpython-311-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_trio.cpython-312-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_trio.cpython-313-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_trio.cpython-314-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_trio.cpython-39-pytest-8.4.2.pyc
-tests/__pycache__/test_proxy_async_trio_v2.cpython-310-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_trio_v2.cpython-311-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_trio_v2.cpython-312-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_trio_v2.cpython-313-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_trio_v2.cpython-314-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_async_trio_v2.cpython-39-pytest-8.4.2.pyc
-tests/__pycache__/test_proxy_sync.cpython-310-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_sync.cpython-311-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_sync.cpython-312-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_sync.cpython-313-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_sync.cpython-314-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_sync.cpython-39-pytest-8.4.2.pyc
-tests/__pycache__/test_proxy_sync_v2.cpython-310-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_sync_v2.cpython-311-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_sync_v2.cpython-312-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_sync_v2.cpython-313-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_sync_v2.cpython-314-pytest-9.1.1.pyc
-tests/__pycache__/test_proxy_sync_v2.cpython-39-pytest-8.4.2.pyc
-tests/__pycache__/test_resolvers.cpython-310-pytest-9.1.1.pyc
-tests/__pycache__/test_resolvers.cpython-311-pytest-9.1.1.pyc
-tests/__pycache__/test_resolvers.cpython-312-pytest-9.1.1.pyc
-tests/__pycache__/test_resolvers.cpython-313-pytest-9.1.1.pyc
-tests/__pycache__/test_resolvers.cpython-314-pytest-9.1.1.pyc
-tests/__pycache__/test_resolvers.cpython-39-pytest-8.4.2.pyc
-tests/__pycache__/utils.cpython-310.pyc
-tests/__pycache__/utils.cpython-311.pyc
-tests/__pycache__/utils.cpython-312.pyc
-tests/__pycache__/utils.cpython-313.pyc
-tests/__pycache__/utils.cpython-314.pyc
-tests/__pycache__/utils.cpython-39.pyc