Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mypy: Re-annotate capture_and_throw in terms of ViewFuncT. 

Requires addition of a type ignore.
This commit is contained in:
neiljp (Neil Pilgrim) 2018-03-14 22:17:07 +00:00
parent 2ed6da77c7
commit e58534022e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/tests/test_logging_handlers.py
View File

@ -14,6 +14,7 @@ from mypy_extensions import NoReturn
from typing import Any, Callable, Dict, Mapping, Optional, Text, Iterator from typing import Any, Callable, Dict, Mapping, Optional, Text, Iterator
from zerver.lib.request import JsonableError from zerver.lib.request import JsonableError
from zerver.lib.types import ViewFuncT
from zerver.lib.test_classes import ZulipTestCase from zerver.lib.test_classes import ZulipTestCase
from zerver.logging_handlers import AdminNotifyHandler from zerver.logging_handlers import AdminNotifyHandler
from zerver.middleware import JsonErrorHandler from zerver.middleware import JsonErrorHandler
@ -22,9 +23,8 @@ from zerver.worker.queue_processors import QueueProcessingWorker
captured_request = None # type: Optional[HttpRequest] captured_request = None # type: Optional[HttpRequest]
captured_exc_info = None captured_exc_info = None
def capture_and_throw( def capture_and_throw(domain: Optional[Text]=None) -> Callable[[ViewFuncT], ViewFuncT]:
domain: Optional[Text]=None) -> Callable[[Callable[..., HttpResponse]], Callable[..., HttpResponse]]: def wrapper(view_func: ViewFuncT) -> ViewFuncT:
def wrapper(view_func: Callable[..., HttpResponse]) -> Callable[..., HttpResponse]:
@wraps(view_func) @wraps(view_func)
def wrapped_view(request: HttpRequest, *args: Any, **kwargs: Any) -> NoReturn: def wrapped_view(request: HttpRequest, *args: Any, **kwargs: Any) -> NoReturn:
global captured_request global captured_request
@ -35,7 +35,7 @@ def capture_and_throw(
global captured_exc_info global captured_exc_info
captured_exc_info = sys.exc_info() captured_exc_info = sys.exc_info()
raise e raise e
return wrapped_view return wrapped_view # type: ignore # https://github.com/python/mypy/issues/1927
return wrapper return wrapper
class AdminNotifyHandlerTest(ZulipTestCase): class AdminNotifyHandlerTest(ZulipTestCase):