Fix missing NoReturn annotations and incorrect try placements

mypy/build.py

@@ -24,7 +24,7 @@
 
 from typing import (AbstractSet, Any, Dict, Iterable, Iterator, List, Sequence,
                     Mapping, NamedTuple, Optional, Set, Tuple, TypeVar, Union, Callable, TextIO)
-from typing_extensions import ClassVar, Final, TYPE_CHECKING, TypeAlias as _TypeAlias
+from typing_extensions import ClassVar, NoReturn, Final, TYPE_CHECKING, TypeAlias as _TypeAlias
 from mypy_extensions import TypedDict
 
 from mypy.nodes import MypyFile, ImportBase, Import, ImportFrom, ImportAll, SymbolTable
@@ -398,7 +398,7 @@ def load_plugins_from_config(
     if line == -1:
         line = 1  # We need to pick some line number that doesn't look too confusing
 
-    def plugin_error(message: str) -> None:
+    def plugin_error(message: str) -> NoReturn:
         errors.report(line, 0, message)
         errors.raise_error(use_stdout=False)
 

mypy/dmypy/client.py

@@ -14,6 +14,7 @@
 import traceback
 
 from typing import Any, Callable, Dict, Mapping, Optional, Tuple, List
+from typing_extensions import NoReturn
 
 from mypy.dmypy_util import DEFAULT_STATUS_FILE, receive
 from mypy.ipc import IPCClient, IPCException
@@ -161,7 +162,7 @@ def main(argv: List[str]) -> None:
             sys.exit(2)
 
 
-def fail(msg: str) -> None:
+def fail(msg: str) -> NoReturn:
     print(msg, file=sys.stderr)
     sys.exit(2)
 

mypy/dmypy_server.py

@@ -209,8 +209,8 @@ def _response_metadata(self) -> Dict[str, str]:
     def serve(self) -> None:
         """Serve requests, synchronously (no thread or fork)."""
         command = None
+        server = IPCServer(CONNECTION_NAME, self.timeout)
         try:
-            server = IPCServer(CONNECTION_NAME, self.timeout)
             with open(self.status_file, 'w') as f:
                 json.dump({'pid': os.getpid(), 'connection_name': server.connection_name}, f)
                 f.write('\n')  # I like my JSON with a trailing newline
@@ -298,11 +298,11 @@ def cmd_stop(self) -> Dict[str, object]:
     def cmd_run(self, version: str, args: Sequence[str],
                 is_tty: bool, terminal_width: int) -> Dict[str, object]:
         """Check a list of files, triggering a restart if needed."""
+        stderr = io.StringIO()
+        stdout = io.StringIO()
         try:
             # Process options can exit on improper arguments, so we need to catch that and
             # capture stderr so the client can report it
-            stderr = io.StringIO()
-            stdout = io.StringIO()
             with redirect_stderr(stderr):
                 with redirect_stdout(stdout):
                     sources, options = mypy.main.process_options(

mypy/errors.py

@@ -1,11 +1,12 @@
 import os.path
 import sys
 import traceback
+
 from mypy.backports import OrderedDict
 from collections import defaultdict
 
 from typing import Tuple, List, TypeVar, Set, Dict, Optional, TextIO, Callable, Union
-from typing_extensions import Final, Literal
+from typing_extensions import Final, Literal, NoReturn
 
 from mypy.scope import Scope
 from mypy.options import Options
@@ -633,7 +634,7 @@ def is_errors_for_file(self, file: str) -> bool:
         """Are there any errors for the given file?"""
         return file in self.error_info_map
 
-    def raise_error(self, use_stdout: bool = True) -> None:
+    def raise_error(self, use_stdout: bool = True) -> NoReturn:
         """Raise a CompileError with the generated messages.
 
         Render the messages suitable for displaying.
@@ -908,7 +909,7 @@ def report_internal_error(err: Exception,
                           options: Options,
                           stdout: Optional[TextIO] = None,
                           stderr: Optional[TextIO] = None,
-                          ) -> None:
+                          ) -> NoReturn:
     """Report internal error and exit.
 
     This optionally starts pdb or shows a traceback.

mypy/main.py

@@ -1138,7 +1138,7 @@ def maybe_write_junit_xml(td: float, serious: bool, messages: List[str], options
             td, serious, messages, options.junit_xml, py_version, options.platform)
 
 
-def fail(msg: str, stderr: TextIO, options: Options) -> None:
+def fail(msg: str, stderr: TextIO, options: Options) -> NoReturn:
     """Fail with a serious error."""
     stderr.write('%s\n' % msg)
     maybe_write_junit_xml(0.0, serious=True, messages=[msg], options=options)

mypy/semanal.py

@@ -4573,6 +4573,8 @@ def lookup_qualified(self, name: str, ctx: Context,
                     assert isinstance(node.target, ProperType)
                     if isinstance(node.target, Instance):
                         nextsym = node.target.type.get(part)
+                    else:
+                        nextsym = None
                 else:
                     if isinstance(node, Var):
                         typ = get_proper_type(node.type)