Move option processing into mypy/options.py

mypy/build.py

@@ -26,6 +26,7 @@
 MYPY = False
 if MYPY:
     from typing import Deque
+    from mypy.options import Options
 
 from mypy.nodes import (MypyFile, Node, ImportBase, Import, ImportFrom, ImportAll)
 from mypy.semanal import FirstPass, SemanticAnalyzer, ThirdPass
@@ -37,13 +38,11 @@
 from mypy import util
 from mypy.fixup import fixup_module_pass_one, fixup_module_pass_two
 from mypy.nodes import Expression
-from mypy.options import Options
 from mypy.parse import parse
 from mypy.stats import dump_type_stats
 from mypy.types import Type
 from mypy.version import __version__
 
-
 # We need to know the location of this file to load data, but
 # until Python 3.4, __file__ is relative.
 __file__ = os.path.realpath(__file__)
@@ -109,7 +108,7 @@ def is_source(self, file: MypyFile) -> bool:
 
 
 def build(sources: List[BuildSource],
-          options: Options,
+          options: 'Options',
           alt_lib_path: str = None,
           bin_dir: str = None) -> BuildResult:
     """Analyze a program.
@@ -362,7 +361,7 @@ def __init__(self, data_dir: str,
                  ignore_prefix: str,
                  source_set: BuildSourceSet,
                  reports: Reports,
-                 options: Options,
+                 options: 'Options',
                  version_id: str) -> None:
         self.start_time = time.time()
         self.data_dir = data_dir
@@ -494,7 +493,7 @@ def module_not_found(self, path: str, line: int, id: str) -> None:
     def report_file(self,
                     file: MypyFile,
                     type_map: Dict[Expression, Type],
-                    options: Options) -> None:
+                    options: 'Options') -> None:
         if self.source_set.is_source(file):
             self.reports.file(file, type_map, options)
 
@@ -1148,7 +1147,7 @@ class State:
     interface_hash = ""  # type: str
 
     # Options, specialized for this file
-    options = None  # type: Options
+    options = None  # type: 'Options'
 
     # Whether to ignore all errors
     ignore_all = False

mypy/checker.py

@@ -55,10 +55,13 @@
 from mypy.treetransform import TransformVisitor
 from mypy.binder import ConditionalTypeBinder, get_declaration
 from mypy.meet import is_overlapping_types
-from mypy.options import Options
 
 from mypy import experiments
 
+# Can't use TYPE_CHECKING because it's not in the Python 3.5.1 stdlib
+MYPY = False
+if MYPY:
+    from mypy.options import Options
 
 T = TypeVar('T')
 
@@ -121,13 +124,13 @@ class TypeChecker(NodeVisitor[None]):
     is_typeshed_stub = False
     # Should strict Optional-related errors be suppressed in this file?
     suppress_none_errors = False  # TODO: Get it from options instead
-    options = None  # type: Options
+    options = None  # type: 'Options'
 
     # The set of all dependencies (suppressed or not) that this module accesses, either
     # directly or indirectly.
     module_refs = None  # type: Set[str]
 
-    def __init__(self, errors: Errors, modules: Dict[str, MypyFile], options: Options,
+    def __init__(self, errors: Errors, modules: Dict[str, MypyFile], options: 'Options',
                  tree: MypyFile, path: str) -> None:
         """Construct a type checker.
 

mypy/errors.py

@@ -6,9 +6,12 @@
 
 from typing import Tuple, List, TypeVar, Set, Dict, Iterator, Optional
 
-from mypy.options import Options
 from mypy.version import __version__ as mypy_version
 
+# Can't use TYPE_CHECKING because it's not in the Python 3.5.1 stdlib
+MYPY = False
+if MYPY:
+    from mypy.options import Options
 
 T = TypeVar('T')
 
@@ -515,7 +518,7 @@ def remove_path_prefix(path: str, prefix: str) -> str:
 
 
 def report_internal_error(err: Exception, file: str, line: int,
-                          errors: Errors, options: Options) -> None:
+                          errors: Errors, options: 'Options') -> None:
     """Report internal error and exit.
 
     This optionally starts pdb or shows a traceback.