Fix merge issues

Author: sixolet

extensions/mypy_extensions.py

@@ -14,6 +14,7 @@
 # the (convenient) behavior of types provided by typing module.
 from typing import _type_check  # type: ignore
 
+
 def _check_fails(cls, other):
     try:
         if sys._getframe(1).f_globals['__name__'] not in ['abc', 'functools', 'typing']:
@@ -93,6 +94,10 @@ class Point2D(TypedDict):
     syntax forms work for Python 2.7 and 3.2+
     """
 
+
+# Return type that indicates a function does not return
+class NoReturn: pass
+
 def Arg(name=None, typ=Any):
     return typ
 

mypy/fastparse.py

@@ -1057,7 +1057,7 @@ def visit_Ellipsis(self, n: ast3.Ellipsis) -> Type:
         return EllipsisType(line=self.line)
 
     # List(expr* elts, expr_context ctx)
-    def visit_List(self, n: ast35.List) -> Type:
+    def visit_List(self, n: ast3.List) -> Type:
         return self.translate_argument_list(n.elts)
 
 
@@ -1072,12 +1072,12 @@ class FastParserError(TypeCommentParseError):
     pass
 
 
-def _extract_str(arg: ast35.expr) -> Optional[str]:
-    if isinstance(arg, ast35.Name) and arg.id == 'None':
+def _extract_str(arg: ast3.expr) -> Optional[str]:
+    if isinstance(arg, ast3.Name) and arg.id == 'None':
         return None
-    elif isinstance(arg, ast35.NameConstant) and arg.value is None:
+    elif isinstance(arg, ast3.NameConstant) and arg.value is None:
         return None
-    elif isinstance(arg, ast35.Str):
+    elif isinstance(arg, ast3.Str):
         return arg.s
     else:
         raise FastParserError("Bad type for name of argument",