Skip to content

Add urllib3.contrib.socks; improve urllib3.connectionpool #8457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 34 commits into from
Aug 4, 2022
Merged
Changes from 3 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
1232e08
fix: Add urllib3.contrib.socks types
Aug 1, 2022
56565eb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 1, 2022
33e7aa9
fix: optional syntax
Aug 1, 2022
ed27153
fix: use collections.abc instead of typing
Aug 1, 2022
bff6e4f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 1, 2022
5bebd34
fix: add missing dependency and remove `Any`
Aug 1, 2022
78858c8
fix: remove unused import
Aug 1, 2022
aadbe4f
Remove private _new_conn
Aug 2, 2022
2bf6fb2
Fix incorrect use of `HTTPS` when should be `HTTP`
Aug 2, 2022
ef2f122
Fix do not use `ClassVar` as it's overridden on instances
Aug 2, 2022
fc92c1e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 2, 2022
daf1115
fix: various declarations in urllib3.connectionpool
Aug 2, 2022
c283533
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 2, 2022
82952d1
Fix flake8
AlexWaygood Aug 2, 2022
ced3693
fix: correct ConnectionCls on SOCKS connection pools
Aug 2, 2022
00e4f7b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 2, 2022
7faefda
fix flake8 again
AlexWaygood Aug 2, 2022
397d9f2
Merge branch 'master' into refactor/urllib3-socks
AlexWaygood Aug 2, 2022
d8d8d0b
fix: add stubtest allowlist entry with todo comment
Aug 3, 2022
2b94314
fix: add second stubtest ignore with second todo comment for clarity
Aug 3, 2022
5642cab
fix: __exit__ method signature
Aug 3, 2022
4180301
fix: Use LifoQueue from .util.queue
Aug 3, 2022
2c0dc2a
fix: various bugs with specifics in urllib3
Aug 3, 2022
57e975d
Merge branch 'master' into refactor/urllib3-socks
Aug 3, 2022
5a2f486
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 3, 2022
d4ef0ff
fix: use SOCKSHTTPSConnection rather than SOCKSHTTPConnection
Aug 3, 2022
3799ea3
fix: stubtest error
Aug 3, 2022
f951a3e
fix: move typing.Literal to typing_extensions.Literal
Aug 3, 2022
322b30f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 3, 2022
834417b
fix: use type[LifoQueue] instead of ClassVar[LifoQueue]
Aug 3, 2022
3e231f4
refactor: update ConnectionPool.LifoQueue to ClassVar[type[queue.Queu…
Aug 3, 2022
5441d50
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 3, 2022
20ce0e2
fix: rename LifoQueue import
Aug 3, 2022
a17c253
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 3, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions stubs/urllib3/urllib3/contrib/socks.pyi
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
from typing_extensions import TypedDict
from typing import Any, ClassVar, Mapping

from ..connection import HTTPConnection, HTTPSConnection
from ..connectionpool import HTTPConnectionPool, HTTPSConnectionPool
from ..poolmanager import PoolManager

class _SockOptions(TypedDict):
socks_version: int
proxy_host: str | None
proxy_port: str | None
username: str | None
password: str | None
rdns: bool

class SOCKSConnection(HTTPConnection):
def __init__(self, _socks_options: _SockOptions, *args: Any, **kwargs: Any) -> None: ...
def _new_conn(self) -> Any: ... # "socks.socksocket":

class SOCKSHTTPSConnection(SOCKSConnection, HTTPSConnection): ...
class SOCKSHTTPConnectionPool(HTTPConnectionPool): ...
class SOCKSHTTPSConnectionPool(HTTPSConnectionPool): ...

class _ConnectionPoolClasses(TypedDict):
http: type[SOCKSHTTPSConnectionPool]
https: type[SOCKSHTTPSConnectionPool]

class SOCKSProxyManager(PoolManager):
pool_classes_by_scheme: ClassVar[_ConnectionPoolClasses]
proxy_url: str

def __init__(
self,
proxy_url: str,
username: str | None = ...,
password: str | None = ...,
num_pools: int = ...,
headers: Mapping[str, str] | None = ...,
**connection_pool_kw: Any,
) -> None: ...