Skip to content

urllib.parse: Fix issues with TypeVar usage and default values #9629

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.

Sign up for GitHub

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
AlexWaygood merged 17 commits into from
Jan 31, 2023
Merged

urllib.parse: Fix issues with TypeVar usage and default values #9629

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
285b095
`urllib.parse`: Fix issues with TypeVar usage and default values
AlexWaygood Jan 30, 2023
0b93e59
Use a TypeAlias, for readability
AlexWaygood Jan 30, 2023
74bca69
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 30, 2023
ea21b82
typing_asteatseataestasn;sjdoinasgs
AlexWaygood Jan 30, 2023
ccd04f4
Update stdlib/urllib/parse.pyi
AlexWaygood Jan 30, 2023
dd2c74b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 30, 2023
309df78
Try adding another overload
AlexWaygood Jan 30, 2023
34a1b11
fix overload order
AlexWaygood Jan 30, 2023
f103ad0
Tighten up third overloads
AlexWaygood Jan 31, 2023
74e022c
add missing import
AlexWaygood Jan 31, 2023
87fb917
Update stdlib/urllib/parse.pyi
AlexWaygood Jan 31, 2023
046b868
simplify
AlexWaygood Jan 31, 2023
8cdd012
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 31, 2023
f63418a
Update stdlib/urllib/parse.pyi
AlexWaygood Jan 31, 2023
16c4941
Try Jelle's version
AlexWaygood Jan 31, 2023
79f3be3
Improve
AlexWaygood Jan 31, 2023
e535cff
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 31, 2023
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
44 changes: 37 additions & 7 deletions stdlib/urllib/parse.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import sys
from collections.abc import Callable, Iterable, Mapping, Sequence
from typing import Any, AnyStr, Generic, NamedTuple, TypeVar, overload
from typing_extensions import Literal, TypeAlias

if sys.version_info >= (3, 9):
from types import GenericAlias
Expand Down Expand Up @@ -155,33 +156,62 @@ def urldefrag(url: str) -> DefragResult: ...
def urldefrag(url: bytes | bytearray | None) -> DefragResultBytes: ...

_Q = TypeVar("_Q", bound=str | Iterable[int])
_QueryType: TypeAlias = (
Mapping[Any, Any] | Mapping[Any, Sequence[Any]] | Sequence[tuple[Any, Any]] | Sequence[tuple[Any, Sequence[Any]]]
)

@overload
def urlencode(
query: _QueryType,
doseq: bool = False,
safe: str = "",
encoding: str | None = None,
errors: str | None = None,
quote_via: Callable[[AnyStr, str, str, str], str] = ...,
) -> str: ...
@overload
def urlencode(
query: _QueryType,
doseq: bool,
safe: _Q,
encoding: str | None = None,
errors: str | None = None,
quote_via: Callable[[AnyStr, _Q, str, str], str] = ...,
) -> str: ...
@overload
def urlencode(
query: Mapping[Any, Any] | Mapping[Any, Sequence[Any]] | Sequence[tuple[Any, Any]] | Sequence[tuple[Any, Sequence[Any]]],
query: _QueryType,
doseq: bool = False,
safe: _Q = ...,
*,
safe: _Q,
encoding: str | None = None,
errors: str | None = None,
quote_via: Callable[[AnyStr, _Q, str, str], str] = ...,
) -> str: ...
def urljoin(base: AnyStr, url: AnyStr | None, allow_fragments: bool = True) -> AnyStr: ...
@overload
def urlparse(url: str, scheme: str | None = "", allow_fragments: bool = True) -> ParseResult: ...
def urlparse(url: str, scheme: str = "", allow_fragments: bool = True) -> ParseResult: ...
@overload
def urlparse(url: bytes | bytearray, scheme: bytes | bytearray | None, allow_fragments: bool = True) -> ParseResultBytes: ...
@overload
def urlparse(
url: bytes | bytearray | None, scheme: bytes | bytearray | None = ..., allow_fragments: bool = True
url: None, scheme: bytes | bytearray | None | Literal[""] = "", allow_fragments: bool = True
) -> ParseResultBytes: ...
@overload
def urlsplit(url: str, scheme: str | None = "", allow_fragments: bool = True) -> SplitResult: ...
def urlsplit(url: str, scheme: str = "", allow_fragments: bool = True) -> SplitResult: ...

if sys.version_info >= (3, 11):
@overload
def urlsplit(url: bytes | None, scheme: bytes | None = ..., allow_fragments: bool = True) -> SplitResultBytes: ...
def urlsplit(url: bytes, scheme: bytes | None, allow_fragments: bool = True) -> SplitResultBytes: ...
@overload
def urlsplit(url: None, scheme: bytes | None | Literal[""] = "", allow_fragments: bool = True) -> SplitResultBytes: ...

else:
@overload
def urlsplit(url: bytes | bytearray, scheme: bytes | bytearray | None, allow_fragments: bool = True) -> SplitResultBytes: ...
@overload
def urlsplit(
url: bytes | bytearray | None, scheme: bytes | bytearray | None = ..., allow_fragments: bool = True
url: None, scheme: bytes | bytearray | None | Literal[""] = "", allow_fragments: bool = True
) -> SplitResultBytes: ...

@overload
Expand Down