From 7bcb07786a538596441c563af7ea935c810c5336 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 7 Jan 2020 15:00:10 +0100 Subject: [PATCH] typing: remove unused "type: ignore" comments (#779) * typing: remove unused "type: ignore" comments Found via: > mypy --warn-unused-ignores --ignore-missing-imports starlette Using: > mypy 0.770+dev.cdd91ba819646b0138b05a8e9180faba4ef0ff92.dirty * fixup! typing: remove unused "type: ignore" comments --- starlette/datastructures.py | 2 +- starlette/formparsers.py | 4 ++-- starlette/graphql.py | 8 ++++---- starlette/middleware/wsgi.py | 2 +- starlette/requests.py | 2 +- starlette/responses.py | 12 ++++++------ starlette/testclient.py | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/starlette/datastructures.py b/starlette/datastructures.py index 40806246..bbfd93ea 100644 --- a/starlette/datastructures.py +++ b/starlette/datastructures.py @@ -460,7 +460,7 @@ class FormData(ImmutableMultiDict): ], **kwargs: typing.Union[str, UploadFile], ) -> None: - super().__init__(*args, **kwargs) # type: ignore + super().__init__(*args, **kwargs) async def close(self) -> None: for key, value in self.multi_items(): diff --git a/starlette/formparsers.py b/starlette/formparsers.py index b7d26d98..e1b9efa2 100644 --- a/starlette/formparsers.py +++ b/starlette/formparsers.py @@ -8,8 +8,8 @@ try: from multipart.multipart import parse_options_header import multipart except ImportError: # pragma: nocover - parse_options_header = None # type: ignore - multipart = None # type: ignore + parse_options_header = None + multipart = None class FormMessage(Enum): diff --git a/starlette/graphql.py b/starlette/graphql.py index 3af6b04a..a2eebebd 100644 --- a/starlette/graphql.py +++ b/starlette/graphql.py @@ -14,10 +14,10 @@ try: from graphql.error import format_error as format_graphql_error from graphql.error import GraphQLError except ImportError: # pragma: nocover - graphene = None # type: ignore - AsyncioExecutor = None # type: ignore - format_graphql_error = None # type: ignore - GraphQLError = None # type: ignore + graphene = None + AsyncioExecutor = None + format_graphql_error = None + GraphQLError = None class GraphQLApp: diff --git a/starlette/middleware/wsgi.py b/starlette/middleware/wsgi.py index b7530f45..f0c69c8d 100644 --- a/starlette/middleware/wsgi.py +++ b/starlette/middleware/wsgi.py @@ -88,7 +88,7 @@ class WSGIResponder: await run_in_threadpool(self.wsgi, environ, self.start_response) self.send_queue.append(None) self.send_event.set() - await asyncio.wait_for(sender, None) # type: ignore + await asyncio.wait_for(sender, None) if self.exc_info is not None: raise self.exc_info[0].with_traceback( self.exc_info[1], self.exc_info[2] diff --git a/starlette/requests.py b/starlette/requests.py index c2f9f2bf..1f7b09e3 100644 --- a/starlette/requests.py +++ b/starlette/requests.py @@ -11,7 +11,7 @@ from starlette.types import Message, Receive, Scope, Send try: from multipart.multipart import parse_options_header except ImportError: # pragma: nocover - parse_options_header = None # type: ignore + parse_options_header = None SERVER_PUSH_HEADERS_TO_COPY = { diff --git a/starlette/responses.py b/starlette/responses.py index e843a1e4..8a298a88 100644 --- a/starlette/responses.py +++ b/starlette/responses.py @@ -18,8 +18,8 @@ try: import aiofiles from aiofiles.os import stat as aio_stat except ImportError: # pragma: nocover - aiofiles = None # type: ignore - aio_stat = None # type: ignore + aiofiles = None + aio_stat = None try: import ujson @@ -100,17 +100,17 @@ class Response: cookie = http.cookies.SimpleCookie() # type: http.cookies.BaseCookie cookie[key] = value if max_age is not None: - cookie[key]["max-age"] = max_age # type: ignore + cookie[key]["max-age"] = max_age if expires is not None: - cookie[key]["expires"] = expires # type: ignore + cookie[key]["expires"] = expires if path is not None: cookie[key]["path"] = path if domain is not None: cookie[key]["domain"] = domain if secure: - cookie[key]["secure"] = True # type: ignore + cookie[key]["secure"] = True if httponly: - cookie[key]["httponly"] = True # type: ignore + cookie[key]["httponly"] = True cookie_val = cookie.output(header="").strip() self.raw_headers.append((b"set-cookie", cookie_val.encode("latin-1"))) diff --git a/starlette/testclient.py b/starlette/testclient.py index 471e6234..03506998 100644 --- a/starlette/testclient.py +++ b/starlette/testclient.py @@ -95,7 +95,7 @@ class _ASGIAdapter(requests.adapters.HTTPAdapter): self.raise_server_exceptions = raise_server_exceptions self.root_path = root_path - def send( # type: ignore + def send( self, request: requests.PreparedRequest, *args: typing.Any, **kwargs: typing.Any ) -> requests.Response: scheme, netloc, path, query, fragment = ( -- 2.47.3