Adjust tests to understand NAMED vs NAMED_OPT

Author: Naomi Seyfer

mypy/fastparse.py

@@ -15,7 +15,7 @@
     StarExpr, YieldFromExpr, NonlocalDecl, DictionaryComprehension,
     SetComprehension, ComplexExpr, EllipsisExpr, YieldExpr, Argument,
     AwaitExpr, TempNode, Expression, Statement,
-    ARG_POS, ARG_OPT, ARG_STAR, ARG_NAMED, ARG_STAR2
+    ARG_POS, ARG_OPT, ARG_STAR, ARG_NAMED, ARG_NAMED_OPT, ARG_STAR2
 )
 from mypy.types import (
     Type, CallableType, AnyType, UnboundType, TupleType, TypeList, EllipsisType,
@@ -363,7 +363,7 @@ def make_argument(arg: ast35.arg, default: Optional[ast35.expr], kind: int) -> A
 
         # keyword-only arguments with defaults
         for a, d in zip(args.kwonlyargs[num_no_kw_defaults:], args.kw_defaults):
-            new_args.append(make_argument(a, d, ARG_NAMED))
+            new_args.append(make_argument(a, d, ARG_NAMED_OPT))
 
         # **kwarg
         if args.kwarg is not None:

mypy/strconv.py

@@ -41,9 +41,9 @@ def func_helper(self, o: 'mypy.nodes.FuncItem') -> List[object]:
         extra = []  # type: List[Tuple[str, List[mypy.nodes.Var]]]
         for i, arg in enumerate(o.arguments):
             kind = arg.kind  # type: int
-            if kind == mypy.nodes.ARG_POS:
+            if kind in (mypy.nodes.ARG_POS, mypy.nodes.ARG_NAMED):
                 args.append(o.arguments[i].variable)
-            elif kind in (mypy.nodes.ARG_OPT, mypy.nodes.ARG_NAMED):
+            elif kind in (mypy.nodes.ARG_OPT, mypy.nodes.ARG_NAMED_OPT):
                 args.append(o.arguments[i].variable)
                 init.append(o.arguments[i].initialization_statement)
             elif kind == mypy.nodes.ARG_STAR:
@@ -108,7 +108,8 @@ def visit_import_all(self, o: 'mypy.nodes.ImportAll') -> str:
     def visit_func_def(self, o: 'mypy.nodes.FuncDef') -> str:
         a = self.func_helper(o)
         a.insert(0, o.name())
-        if mypy.nodes.ARG_NAMED in [arg.kind for arg in o.arguments]:
+        arg_kinds = set([arg.kind for arg in o.arguments])
+        if len(arg_kinds & set([mypy.nodes.ARG_NAMED, mypy.nodes.ARG_NAMED_OPT])) > 0:
             a.insert(1, 'MaxPos({})'.format(o.max_pos))
         if o.is_abstract:
             a.insert(-1, 'Abstract')

mypy/stubgen.py

@@ -55,7 +55,8 @@
 from mypy.nodes import (
     Expression, IntExpr, UnaryExpr, StrExpr, BytesExpr, NameExpr, FloatExpr, MemberExpr, TupleExpr,
     ListExpr, ComparisonExpr, CallExpr, ClassDef, MypyFile, Decorator, AssignmentStmt,
-    IfStmt, ImportAll, ImportFrom, Import, FuncDef, FuncBase, ARG_STAR, ARG_STAR2, ARG_NAMED
+    IfStmt, ImportAll, ImportFrom, Import, FuncDef, FuncBase,
+    ARG_STAR, ARG_STAR2, ARG_NAMED, ARG_NAMED_OPT,
 )
 from mypy.stubgenc import parse_all_signatures, find_unique_signatures, generate_stub_for_c_module
 from mypy.stubutil import is_c_module, write_header
@@ -261,7 +262,7 @@ def visit_func_def(self, o: FuncDef) -> None:
             name = var.name()
             init_stmt = arg_.initialization_statement
             if init_stmt:
-                if kind == ARG_NAMED and '*' not in args:
+                if kind in (ARG_NAMED, ARG_NAMED_OPT) and '*' not in args:
                     args.append('*')
                 typename = self.get_str_type_of_node(init_stmt.rvalue, True)
                 arg = '{}: {} = ...'.format(name, typename)

mypy/subtypes.py

@@ -10,7 +10,10 @@
 # Circular import; done in the function instead.
 # import mypy.solve
 from mypy import messages, sametypes
-from mypy.nodes import CONTRAVARIANT, COVARIANT, ARG_POS, ARG_OPT, ARG_STAR, ARG_STAR2, ARG_NAMED, ARG_NAMED_OPT
+from mypy.nodes import (
+    CONTRAVARIANT, COVARIANT, ARG_POS, ARG_OPT, ARG_STAR,
+    ARG_STAR2, ARG_NAMED, ARG_NAMED_OPT,
+)
 from mypy.maptype import map_instance_to_supertype
 
 from mypy import experiments

mypy/types.py

@@ -7,7 +7,10 @@
 )
 
 import mypy.nodes
-from mypy.nodes import INVARIANT, SymbolNode, ARG_POS, ARG_OPT, ARG_STAR, ARG_STAR2, ARG_NAMED, ARG_NAMED_OPT
+from mypy.nodes import (
+    INVARIANT, SymbolNode,
+    ARG_POS, ARG_OPT, ARG_STAR, ARG_STAR2, ARG_NAMED, ARG_NAMED_OPT,
+)
 
 from mypy import experiments
 

test-data/unit/parse.test

@@ -2340,7 +2340,7 @@ MypyFile:1(
     Args(
       Var(x)
       Var(y))
-    def (x: A?, *, y: B?) -> None?
+    def (x: A?, *, y: B? =) -> None?
     Init(
       AssignmentStmt:1(
         NameExpr(y)
@@ -2357,7 +2357,7 @@ MypyFile:1(
     MaxPos(0)
     Args(
       Var(y))
-    def (*, y: B?) -> None?
+    def (*, y: B? =) -> None?
     Init(
       AssignmentStmt:1(
         NameExpr(y)
@@ -2375,7 +2375,6 @@ MypyFile:1(
     Args(
       Var(y))
     def (*, y: B?) -> None?
-    Init()
     Block:1(
       PassStmt:1())))
 

test-data/unit/semanal-types.test

@@ -1005,7 +1005,7 @@ MypyFile:1(
     MaxPos(0)
     Args(
       Var(y))
-    def (*x: builtins.int, *, y: builtins.str) -> Any
+    def (*x: builtins.int, *, y: builtins.str =) -> Any
     Init(
       AssignmentStmt:1(
         NameExpr(y [l])