test_logging_handlers: Fix strict_optional errors.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-07-04 16:05:40 -07:00
committed by Tim Abbott
parent dd7082e466
commit c65e7772a7
2 changed files with 2 additions and 4 deletions

View File

@@ -40,8 +40,6 @@ strict_optional = True
# Tests (may be many issues in file; comment is just one error noted) # Tests (may be many issues in file; comment is just one error noted)
[mypy-zerver/tests/test_logging_handlers] #73: error: Argument 7 to "makeRecord" of "Logger" has incompatible type "Tuple[Optional[Type[BaseException]], Optional[BaseException], Optional[TracebackType]]"; expected "Union[Tuple[type, BaseException, TracebackType], Tuple[None, None, None], None]"
strict_optional = False
[mypy-zerver/tests/test_decorators] #1322: error: Item "None" of "Optional[Match[str]]" has no attribute "groupdict" [mypy-zerver/tests/test_decorators] #1322: error: Item "None" of "Optional[Match[str]]" has no attribute "groupdict"
strict_optional = False strict_optional = False
[mypy-zerver/tests/test_auth_backends] #2079: error: Incompatible types in assignment (expression has type "Optional[UserProfile]", variable has type "UserProfile") [mypy-zerver/tests/test_auth_backends] #2079: error: Incompatible types in assignment (expression has type "Optional[UserProfile]", variable has type "UserProfile")

View File

@@ -2,7 +2,7 @@ import logging
import sys import sys
from functools import wraps from functools import wraps
from types import TracebackType from types import TracebackType
from typing import Callable, Dict, Iterator, NoReturn, Optional, Tuple, Type, cast from typing import Callable, Dict, Iterator, NoReturn, Optional, Tuple, Type, Union, cast
from unittest.mock import MagicMock, patch from unittest.mock import MagicMock, patch
from django.conf import settings from django.conf import settings
@@ -15,7 +15,7 @@ from zerver.lib.types import ViewFuncT
from zerver.logging_handlers import AdminNotifyHandler, HasRequest from zerver.logging_handlers import AdminNotifyHandler, HasRequest
captured_request: Optional[HttpRequest] = None captured_request: Optional[HttpRequest] = None
captured_exc_info: Tuple[Optional[Type[BaseException]], Optional[BaseException], Optional[TracebackType]] = None captured_exc_info: Optional[Union[Tuple[Type[BaseException], BaseException, TracebackType], Tuple[None, None, None]]] = None
def capture_and_throw(domain: Optional[str]=None) -> Callable[[ViewFuncT], ViewFuncT]: def capture_and_throw(domain: Optional[str]=None) -> Callable[[ViewFuncT], ViewFuncT]:
def wrapper(view_func: ViewFuncT) -> ViewFuncT: def wrapper(view_func: ViewFuncT) -> ViewFuncT:
@wraps(view_func) @wraps(view_func)