Changed flag to --disallow-untyped-defs

Author: ddfisher

mypy/build.py

@@ -55,7 +55,7 @@
 # Disallow calling untyped functions from typed ones
 DISALLOW_UNTYPED_CALLS = 'disallow-untyped-calls'
 # Disallow defining untyped (or incompletely typed) functions
-DISALLOW_UNTYPED_FUNCS = 'disallow-untyped-funcs'
+DISALLOW_UNTYPED_DEFS = 'disallow-untyped-defs'
 
 # State ids. These describe the states a source file / module can be in a
 # build.
@@ -386,7 +386,7 @@ def __init__(self, data_dir: str,
                                         modules,
                                         self.pyversion,
                                         DISALLOW_UNTYPED_CALLS in self.flags,
-                                        DISALLOW_UNTYPED_FUNCS in self.flags)
+                                        DISALLOW_UNTYPED_DEFS in self.flags)
         self.states = []  # type: List[State]
         self.module_files = {}  # type: Dict[str, str]
         self.module_deps = {}  # type: Dict[Tuple[str, str], bool]

mypy/checker.py

@@ -367,11 +367,11 @@ class TypeChecker(NodeVisitor[Type]):
     # This makes it an error to call an untyped function from a typed one
     disallow_untyped_calls = False
     # This makes it an error to define an untyped or partially-typed function
-    disallow_untyped_funcs = False
+    disallow_untyped_defs = False
 
     def __init__(self, errors: Errors, modules: Dict[str, MypyFile],
                  pyversion: Tuple[int, int] = defaults.PYTHON3_VERSION,
-                 disallow_untyped_calls=False, disallow_untyped_funcs=False) -> None:
+                 disallow_untyped_calls=False, disallow_untyped_defs=False) -> None:
         """Construct a type checker.
 
         Use errors to report type check errors. Assume symtable has been
@@ -395,7 +395,7 @@ def __init__(self, errors: Errors, modules: Dict[str, MypyFile],
         self.pass_num = 0
         self.current_node_deferred = False
         self.disallow_untyped_calls = disallow_untyped_calls
-        self.disallow_untyped_funcs = disallow_untyped_funcs
+        self.disallow_untyped_defs = disallow_untyped_defs
 
     def visit_file(self, file_node: MypyFile, path: str) -> None:
         """Type check a mypy file with the given path."""
@@ -661,7 +661,7 @@ def check_func_def(self, defn: FuncItem, typ: CallableType, name: str) -> None:
                     self.fail(messages.INIT_MUST_HAVE_NONE_RETURN_TYPE,
                               item.type)
 
-                if self.disallow_untyped_funcs:
+                if self.disallow_untyped_defs:
                     # Check for functions with unspecified/not fully specified types.
                     def is_implicit_any(t: Type) -> bool:
                         return isinstance(t, AnyType) and t.implicit

mypy/main.py

@@ -180,8 +180,8 @@ def process_options(args: List[str]) -> Tuple[List[BuildSource], Options]:
         elif args[0] == '--disallow-untyped-calls':
             options.build_flags.append(build.DISALLOW_UNTYPED_CALLS)
             args = args[1:]
-        elif args[0] == '--disallow-untyped-functions':
-            options.build_flags.append(build.DISALLOW_UNTYPED_FUNCS)
+        elif args[0] == '--disallow-untyped-defs':
+            options.build_flags.append(build.DISALLOW_UNTYPED_DEFS)
             args = args[1:]
         elif args[0] in ('--version', '-V'):
             ver = True
@@ -318,7 +318,7 @@ def usage(msg: str = None) -> None:
   -s, --silent-imports  don't follow imports to .py files
   --disallow-untyped-calls  disallow calling functions without type annotations
                             from functions with type annotations
-  --disallow-untyped-funcs  disallow defining functions without type annotations
+  --disallow-untyped-defs   disallow defining functions without type annotations
                             or with incomplete type annotations
   --implicit-any     behave as though all functions were annotated with Any
   -f, --dirty-stubs  don't warn if typeshed is out of sync