From c75ecf0bca432c367d2d15534d3ad60303208524 Mon Sep 17 00:00:00 2001 From: Avasam Date: Thu, 29 Feb 2024 01:27:07 -0500 Subject: [PATCH] Fix invalid noqa comments and poorly formatted type ignores (#11497) --- stubs/WTForms/@tests/test_cases/check_filters.py | 16 ++++++++-------- .../@tests/test_cases/check_validators.py | 8 ++++---- stubs/WTForms/@tests/test_cases/check_widgets.py | 6 +++--- stubs/WebOb/webob/cachecontrol.pyi | 2 +- stubs/WebOb/webob/cookies.pyi | 4 ++-- stubs/WebOb/webob/exc.pyi | 4 ++-- stubs/WebOb/webob/headers.pyi | 2 +- stubs/WebOb/webob/multidict.pyi | 10 +++++----- stubs/fanstatic/fanstatic/compiler.pyi | 2 +- stubs/fanstatic/fanstatic/core.pyi | 2 +- stubs/fanstatic/fanstatic/registry.pyi | 2 +- stubs/gevent/gevent/threadpool.pyi | 2 +- stubs/olefile/olefile/olefile.pyi | 4 ++-- .../openpyxl/openpyxl/chartsheet/chartsheet.pyi | 2 +- stubs/openpyxl/openpyxl/descriptors/base.pyi | 4 ++-- stubs/openpyxl/openpyxl/descriptors/nested.pyi | 2 +- stubs/openpyxl/openpyxl/drawing/xdr.pyi | 6 +++--- stubs/openpyxl/openpyxl/worksheet/dimensions.pyi | 2 +- stubs/openpyxl/openpyxl/worksheet/filters.pyi | 2 +- stubs/setuptools/setuptools/sandbox.pyi | 2 +- .../translationstring/__init__.pyi | 2 +- 21 files changed, 43 insertions(+), 43 deletions(-) diff --git a/stubs/WTForms/@tests/test_cases/check_filters.py b/stubs/WTForms/@tests/test_cases/check_filters.py index 26ad95554..6a5abce57 100644 --- a/stubs/WTForms/@tests/test_cases/check_filters.py +++ b/stubs/WTForms/@tests/test_cases/check_filters.py @@ -35,11 +35,11 @@ field.process(None, extra_filters=[Filter1(), Filter2()]) # but if we pass in some callables with an incompatible param spec # then we should get type errors -Field(filters=(str.upper, str.lower, int, not_a_filter)) # type:ignore -Field(filters=(Filter1(), Filter2(), also_not_a_filter)) # type:ignore -Field(filters=[str.upper, str.lower, int, also_not_a_filter]) # type:ignore -Field(filters=[Filter1(), Filter2(), not_a_filter]) # type:ignore -field.process(None, extra_filters=(str.upper, str.lower, int, not_a_filter)) # type:ignore -field.process(None, extra_filters=(Filter1(), Filter2(), also_not_a_filter)) # type:ignore -field.process(None, extra_filters=[str.upper, str.lower, int, also_not_a_filter]) # type:ignore -field.process(None, extra_filters=[Filter1(), Filter2(), not_a_filter]) # type:ignore +Field(filters=(str.upper, str.lower, int, not_a_filter)) # type: ignore +Field(filters=(Filter1(), Filter2(), also_not_a_filter)) # type: ignore +Field(filters=[str.upper, str.lower, int, also_not_a_filter]) # type: ignore +Field(filters=[Filter1(), Filter2(), not_a_filter]) # type: ignore +field.process(None, extra_filters=(str.upper, str.lower, int, not_a_filter)) # type: ignore +field.process(None, extra_filters=(Filter1(), Filter2(), also_not_a_filter)) # type: ignore +field.process(None, extra_filters=[str.upper, str.lower, int, also_not_a_filter]) # type: ignore +field.process(None, extra_filters=[Filter1(), Filter2(), not_a_filter]) # type: ignore diff --git a/stubs/WTForms/@tests/test_cases/check_validators.py b/stubs/WTForms/@tests/test_cases/check_validators.py index ba89d64fd..592968c18 100644 --- a/stubs/WTForms/@tests/test_cases/check_validators.py +++ b/stubs/WTForms/@tests/test_cases/check_validators.py @@ -14,16 +14,16 @@ string_field = StringField(validators=(Optional(), Email())) string_field.validate(form, (Optional(), Email())) # but not on Field -field = Field(validators=(Optional(), Email())) # type:ignore -field.validate(form, (Optional(), Email())) # type:ignore +field = Field(validators=(Optional(), Email())) # type: ignore +field.validate(form, (Optional(), Email())) # type: ignore # unless we only pass the Field validator Field(validators=(Optional(),)) field.validate(form, (Optional(),)) # DateField should accept Field validators but not StringField validators -date_field = DateField(validators=(Optional(), Email())) # type:ignore -date_field.validate(form, (Optional(), Email())) # type:ignore +date_field = DateField(validators=(Optional(), Email())) # type: ignore +date_field.validate(form, (Optional(), Email())) # type: ignore DateField(validators=(Optional(),)) # for lists we can't be as strict so we won't get type errors here diff --git a/stubs/WTForms/@tests/test_cases/check_widgets.py b/stubs/WTForms/@tests/test_cases/check_widgets.py index d5914ceff..7935359a0 100644 --- a/stubs/WTForms/@tests/test_cases/check_widgets.py +++ b/stubs/WTForms/@tests/test_cases/check_widgets.py @@ -5,8 +5,8 @@ from wtforms.widgets import Input, ListWidget, Option, Select, TableWidget, Text # more specific widgets should only work on more specific fields Field(widget=Input()) -Field(widget=TextArea()) # type:ignore -Field(widget=Select()) # type:ignore +Field(widget=TextArea()) # type: ignore +Field(widget=Select()) # type: ignore # less specific widgets are fine, even if they're often not what you want StringField(widget=Input()) @@ -15,7 +15,7 @@ StringField(widget=TextArea()) SelectField(widget=Input(), option_widget=Input()) SelectField(widget=Select(), option_widget=Option()) # a more specific type other than Option widget is not allowed -SelectField(widget=Select(), option_widget=TextArea()) # type:ignore +SelectField(widget=Select(), option_widget=TextArea()) # type: ignore # we should be able to pass Field() even though it wants an unbound_field # this gets around __new__ not working in type checking diff --git a/stubs/WebOb/webob/cachecontrol.pyi b/stubs/WebOb/webob/cachecontrol.pyi index 0c8fe56d6..d38249a2b 100644 --- a/stubs/WebOb/webob/cachecontrol.pyi +++ b/stubs/WebOb/webob/cachecontrol.pyi @@ -83,7 +83,7 @@ class _ResponseCacheControl(_BaseCacheControl): stale_if_error: _IntValueProperty[None] class _AnyCacheControl(_RequestCacheControl, _ResponseCacheControl): - type: None # type:ignore[assignment] + type: None # type: ignore[assignment] class CacheControl(_AnyCacheControl): @overload diff --git a/stubs/WebOb/webob/cookies.pyi b/stubs/WebOb/webob/cookies.pyi index 5ad5ff1b7..2ee0ce964 100644 --- a/stubs/WebOb/webob/cookies.pyi +++ b/stubs/WebOb/webob/cookies.pyi @@ -41,9 +41,9 @@ class Cookie(dict[str, Morsel]): def __init__(self, input: str | None = None) -> None: ... def load(self, data: str) -> None: ... def add(self, key: str | bytes, val: str | bytes) -> Morsel: ... - def __setitem__(self, key: str | bytes, val: str | bytes) -> Morsel: ... # type:ignore[override] + def __setitem__(self, key: str | bytes, val: str | bytes) -> Morsel: ... # type: ignore[override] def serialize(self, full: bool = True) -> str: ... - def values(self) -> list[Morsel]: ... # type:ignore[override] + def values(self) -> list[Morsel]: ... # type: ignore[override] def __str__(self, full: bool = True) -> str: ... class Morsel(dict[bytes, bytes | bool | None]): diff --git a/stubs/WebOb/webob/exc.pyi b/stubs/WebOb/webob/exc.pyi index 4856ca590..e3f9e4b36 100644 --- a/stubs/WebOb/webob/exc.pyi +++ b/stubs/WebOb/webob/exc.pyi @@ -40,8 +40,8 @@ class WSGIHTTPException(Response, HTTPException): def json_body(self, environ: WSGIEnvironment) -> str: ... def generate_response(self, environ: WSGIEnvironment, start_response: StartResponse) -> Iterable[bytes]: ... @property - def wsgi_response(self) -> Self: ... # type:ignore[override] - def __str__(self) -> str: ... # type:ignore[override] # noqaY029 + def wsgi_response(self) -> Self: ... # type: ignore[override] + def __str__(self) -> str: ... # type: ignore[override] # noqa: Y029 class HTTPError(WSGIHTTPException): ... class HTTPRedirection(WSGIHTTPException): ... diff --git a/stubs/WebOb/webob/headers.pyi b/stubs/WebOb/webob/headers.pyi index 35859b327..abd938520 100644 --- a/stubs/WebOb/webob/headers.pyi +++ b/stubs/WebOb/webob/headers.pyi @@ -11,7 +11,7 @@ class EnvironHeaders(MutableMapping[str, str]): def __getitem__(self, hname: str) -> str: ... def __setitem__(self, hname: str, value: str) -> None: ... def __delitem__(self, hname: str) -> None: ... - def keys(self) -> list[str]: ... # type:ignore[override] + def keys(self) -> list[str]: ... # type: ignore[override] def __contains__(self, hname: object) -> bool: ... def __len__(self) -> int: ... def __iter__(self) -> Iterator[str]: ... diff --git a/stubs/WebOb/webob/multidict.pyi b/stubs/WebOb/webob/multidict.pyi index 932c39c1f..d2d9a0768 100644 --- a/stubs/WebOb/webob/multidict.pyi +++ b/stubs/WebOb/webob/multidict.pyi @@ -45,7 +45,7 @@ class MultiDict(MutableMapping[_KT, _VT]): @overload def pop(self, key: _KT, default: _T) -> _VT | _T: ... def popitem(self) -> tuple[_KT, _VT]: ... - @overload # type:ignore[override] + @overload # type: ignore[override] def update(self, __m: Collection[tuple[_KT, _VT]], **kwargs: _VT) -> None: ... @overload def update(self, **kwargs: _VT) -> None: ... @@ -58,10 +58,10 @@ class MultiDict(MutableMapping[_KT, _VT]): @overload def extend(self, other: None = None, **kwargs: _VT) -> None: ... def __len__(self) -> int: ... - def keys(self) -> Iterator[_KT]: ... # type:ignore[override] + def keys(self) -> Iterator[_KT]: ... # type: ignore[override] __iter__ = keys - def values(self) -> Iterator[_VT]: ... # type:ignore[override] - def items(self) -> Iterator[tuple[_KT, _VT]]: ... # type:ignore[override] + def values(self) -> Iterator[_VT]: ... # type: ignore[override] + def items(self) -> Iterator[tuple[_KT, _VT]]: ... # type: ignore[override] class GetDict(MultiDict[str, str]): env: WSGIEnvironment @@ -82,7 +82,7 @@ class NestedMultiDict(MultiDict[_KT, _VT]): def pop(self, key: _KT, default: Any = ...) -> Any: ... def popitem(self) -> tuple[_KT, _VT]: ... def update(self, *args: Any, **kwargs: _VT) -> None: ... - def copy(self) -> MultiDict[_KT, _VT]: ... # type:ignore[override] + def copy(self) -> MultiDict[_KT, _VT]: ... # type: ignore[override] class NoVars: reason: str diff --git a/stubs/fanstatic/fanstatic/compiler.pyi b/stubs/fanstatic/fanstatic/compiler.pyi index 642a74fee..3ac5c78d6 100644 --- a/stubs/fanstatic/fanstatic/compiler.pyi +++ b/stubs/fanstatic/fanstatic/compiler.pyi @@ -70,7 +70,7 @@ class CoffeeScript(CommandlineBase, Compiler): name: ClassVar[Literal["coffee"]] command: ClassVar[Literal["coffee"]] source_extension = NotImplemented - def process( # type:ignore[override] + def process( # type: ignore[override] self, source: StrOrBytesPath | _SourceType, target: StrOrBytesPath | _TargetType ) -> None: ... diff --git a/stubs/fanstatic/fanstatic/core.pyi b/stubs/fanstatic/fanstatic/core.pyi index d7d518316..8279c2c8a 100644 --- a/stubs/fanstatic/fanstatic/core.pyi +++ b/stubs/fanstatic/fanstatic/core.pyi @@ -174,7 +174,7 @@ class Group(Dependable): depends: set[Dependable] supports: set[Dependable] def __init__(self, depends: Iterable[Dependable]) -> None: ... - def set_dependencies(self, depends: Iterable[Dependable]) -> None: ... # type:ignore[override] + def set_dependencies(self, depends: Iterable[Dependable]) -> None: ... # type: ignore[override] def list_assets(self) -> set[Asset]: ... def need(self, slots: dict[Slot, Resource] | None = None) -> None: ... diff --git a/stubs/fanstatic/fanstatic/registry.pyi b/stubs/fanstatic/fanstatic/registry.pyi index 9612bb5f3..aa32a8f58 100644 --- a/stubs/fanstatic/fanstatic/registry.pyi +++ b/stubs/fanstatic/fanstatic/registry.pyi @@ -21,7 +21,7 @@ class Registry(dict[str, _NamedT]): @property @abstractmethod def ENTRY_POINT(self) -> str: ... - def __init__(self, items: Iterable[_NamedT] = ()) -> None: ... # noqaY011 + def __init__(self, items: Iterable[_NamedT] = ()) -> None: ... def add(self, item: _NamedT) -> None: ... def load_items_from_entry_points(self) -> None: ... def make_item_from_entry_point(self, entry_point: EntryPoint) -> Any: ... diff --git a/stubs/gevent/gevent/threadpool.pyi b/stubs/gevent/gevent/threadpool.pyi index 018807265..ac1e5cd14 100644 --- a/stubs/gevent/gevent/threadpool.pyi +++ b/stubs/gevent/gevent/threadpool.pyi @@ -34,7 +34,7 @@ class ThreadPool(GroupMappingMixin): def join(self) -> None: ... def kill(self) -> None: ... def adjust(self) -> None: ... - def spawn(self, func: Callable[_P, _T], *args: _P.args, **kwargs: _P.kwargs) -> AsyncResult[_T]: ... # type:ignore[override] + def spawn(self, func: Callable[_P, _T], *args: _P.args, **kwargs: _P.kwargs) -> AsyncResult[_T]: ... # type: ignore[override] class ThreadResult(Generic[_T]): receiver: _Receiver[_T] diff --git a/stubs/olefile/olefile/olefile.pyi b/stubs/olefile/olefile/olefile.pyi index 642abc9fe..b1df2da29 100644 --- a/stubs/olefile/olefile/olefile.pyi +++ b/stubs/olefile/olefile/olefile.pyi @@ -179,13 +179,13 @@ class OleFileIO: raise_defects: int = 40, write_mode: bool = False, debug: bool = False, - path_encoding: str | None = DEFAULT_PATH_ENCODING, # noqaY011 + path_encoding: str | None = DEFAULT_PATH_ENCODING, # noqa: Y011 ) -> None: ... def __del__(self) -> None: ... def __enter__(self) -> Self: ... def __exit__(self, *args: object) -> None: ... def _raise_defect( - self, defect_level: int, message: str, exception_type: type[Exception] = OleFileError # noqaY011 + self, defect_level: int, message: str, exception_type: type[Exception] = OleFileError # noqa: Y011 ) -> None: ... def _decode_utf16_str(self, utf16_str: bytes, errors: str = "replace") -> bytes: ... def open(self, filename: IO[bytes] | bytes | str, write_mode: bool = False) -> None: ... diff --git a/stubs/openpyxl/openpyxl/chartsheet/chartsheet.pyi b/stubs/openpyxl/openpyxl/chartsheet/chartsheet.pyi index 74e752b7d..789acb766 100644 --- a/stubs/openpyxl/openpyxl/chartsheet/chartsheet.pyi +++ b/stubs/openpyxl/openpyxl/chartsheet/chartsheet.pyi @@ -55,4 +55,4 @@ class Chartsheet(_WorkbookChild, Serialisable): sheet_state: _VisibilityType = "visible", ) -> None: ... def add_chart(self, chart) -> None: ... - def to_tree(self) -> Element: ... # type:ignore[override] + def to_tree(self) -> Element: ... # type: ignore[override] diff --git a/stubs/openpyxl/openpyxl/descriptors/base.pyi b/stubs/openpyxl/openpyxl/descriptors/base.pyi index 230808f0a..1983e428d 100644 --- a/stubs/openpyxl/openpyxl/descriptors/base.pyi +++ b/stubs/openpyxl/openpyxl/descriptors/base.pyi @@ -144,7 +144,7 @@ class Max(Convertible[_M, _N]): allow_none: Literal[False] = False, max: float, ) -> None: ... - @overload # type:ignore[override] # Different restrictions + @overload # type: ignore[override] # Different restrictions def __set__(self: Max[int, Literal[True]], instance: Serialisable | Strict, value: ConvertibleToInt | None) -> None: ... @overload def __set__(self: Max[int, Literal[False]], instance: Serialisable | Strict, value: ConvertibleToInt) -> None: ... @@ -178,7 +178,7 @@ class Min(Convertible[_M, _N]): allow_none: Literal[False] = False, min: float, ) -> None: ... - @overload # type:ignore[override] # Different restrictions + @overload # type: ignore[override] # Different restrictions def __set__(self: Min[int, Literal[True]], instance: Serialisable | Strict, value: ConvertibleToInt | None) -> None: ... @overload def __set__(self: Min[int, Literal[False]], instance: Serialisable | Strict, value: ConvertibleToInt) -> None: ... diff --git a/stubs/openpyxl/openpyxl/descriptors/nested.pyi b/stubs/openpyxl/openpyxl/descriptors/nested.pyi index b7cb17ca2..6a164ae5b 100644 --- a/stubs/openpyxl/openpyxl/descriptors/nested.pyi +++ b/stubs/openpyxl/openpyxl/descriptors/nested.pyi @@ -234,7 +234,7 @@ class NestedMinMax(Nested[_M], MinMax[_M, _N]): # type: ignore[misc] def __get__(self: NestedMinMax[_M, Literal[True]], instance: Serialisable | Strict, cls: type | None = None) -> _M | None: ... @overload def __get__(self: NestedMinMax[_M, Literal[False]], instance: Serialisable | Strict, cls: type | None = None) -> _M: ... - @overload # type:ignore[override] # Different restrictions + @overload # type: ignore[override] # Different restrictions def __set__( self: NestedMinMax[int, Literal[True]], instance: Serialisable | Strict, diff --git a/stubs/openpyxl/openpyxl/drawing/xdr.pyi b/stubs/openpyxl/openpyxl/drawing/xdr.pyi index 771f8dec9..cab346f75 100644 --- a/stubs/openpyxl/openpyxl/drawing/xdr.pyi +++ b/stubs/openpyxl/openpyxl/drawing/xdr.pyi @@ -3,19 +3,19 @@ from typing import ClassVar from .geometry import Point2D, PositiveSize2D, Transform2D class XDRPoint2D(Point2D): - namespace: ClassVar[None] # type:ignore[assignment] + namespace: ClassVar[None] # type: ignore[assignment] # Same as parent # x = Point2D.x # y = Point2D.y class XDRPositiveSize2D(PositiveSize2D): - namespace: ClassVar[None] # type:ignore[assignment] + namespace: ClassVar[None] # type: ignore[assignment] # Same as parent # cx = PositiveSize2D.cx # cy = PositiveSize2D.cy class XDRTransform2D(Transform2D): - namespace: ClassVar[None] # type:ignore[assignment] + namespace: ClassVar[None] # type: ignore[assignment] # Same as parent # rot = Transform2D.rot # flipH = Transform2D.flipH diff --git a/stubs/openpyxl/openpyxl/worksheet/dimensions.pyi b/stubs/openpyxl/openpyxl/worksheet/dimensions.pyi index 27c71c274..1bed2959c 100644 --- a/stubs/openpyxl/openpyxl/worksheet/dimensions.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/dimensions.pyi @@ -73,7 +73,7 @@ class ColumnDimension(Dimension): width: Float[Literal[False]] bestFit: Bool[Literal[False]] auto_size: Alias - index: String[Literal[False]] # type:ignore[assignment] + index: String[Literal[False]] # type: ignore[assignment] min: Integer[Literal[True]] max: Integer[Literal[True]] collapsed: Bool[Literal[False]] diff --git a/stubs/openpyxl/openpyxl/worksheet/filters.pyi b/stubs/openpyxl/openpyxl/worksheet/filters.pyi index a757630b6..30d12af81 100644 --- a/stubs/openpyxl/openpyxl/worksheet/filters.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/filters.pyi @@ -173,7 +173,7 @@ class DynamicFilter(Serialisable): class CustomFilterValueDescriptor(Convertible[float | str, _N]): pattern: Pattern[str] expected_type: type[float | str] - @overload # type:ignore[override] # Different restrictions + @overload # type: ignore[override] # Different restrictions def __set__( self: CustomFilterValueDescriptor[Literal[True]], instance: Serialisable | Strict, value: str | ConvertibleToFloat | None ) -> None: ... diff --git a/stubs/setuptools/setuptools/sandbox.pyi b/stubs/setuptools/setuptools/sandbox.pyi index 9a7611d1d..32328ac7c 100644 --- a/stubs/setuptools/setuptools/sandbox.pyi +++ b/stubs/setuptools/setuptools/sandbox.pyi @@ -59,7 +59,7 @@ class DirectorySandbox(AbstractSandbox): write_ops: Any def __init__(self, sandbox, exceptions=...) -> None: ... def tmpnam(self) -> None: ... - def open(self, file, flags, mode: int = 511, *args, **kw): ... # type:ignore[override] + def open(self, file, flags, mode: int = 511, *args, **kw): ... # type: ignore[override] class SandboxViolation(DistutilsError): tmpl: Any diff --git a/stubs/translationstring/translationstring/__init__.pyi b/stubs/translationstring/translationstring/__init__.pyi index 8e2f38c01..5b2f11cae 100644 --- a/stubs/translationstring/translationstring/__init__.pyi +++ b/stubs/translationstring/translationstring/__init__.pyi @@ -63,7 +63,7 @@ class TranslationString(str): mapping: dict[str, Any] | None = None, context: str | None = None, ) -> Self: ... - def __mod__(self, options: dict[str, Any]) -> TranslationString: ... # type:ignore[override] + def __mod__(self, options: dict[str, Any]) -> TranslationString: ... # type: ignore[override] def interpolate(self, translated: str | None = None) -> str: ... def __reduce__(self) -> tuple[type[Self], tuple[str, str | None, str, dict[str, Any], str | None]]: ...