Don't use TYPE_CHECKING (because it isn't in 3.5.1), use MYPY instead

Author: cpennington

mypy/build.py

@@ -21,11 +21,12 @@
 from os.path import dirname, basename
 
 from typing import (AbstractSet, Dict, Iterable, Iterator, List,
-                    NamedTuple, Optional, Set, Tuple, Union, TYPE_CHECKING)
+                    NamedTuple, Optional, Set, Tuple, Union)
 # Can't use TYPE_CHECKING because it's not in the Python 3.5.1 stdlib
 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
@@ -42,9 +43,6 @@
 from mypy.types import Type
 from mypy.version import __version__
 
-if TYPE_CHECKING:
-    from mypy.options import Options
-
 # 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__)

mypy/checker.py

@@ -6,8 +6,7 @@
 import sys
 
 from typing import (
-    Dict, Set, List, cast, Tuple, TypeVar, Union, Optional, NamedTuple, Iterator,
-    TYPE_CHECKING
+    Dict, Set, List, cast, Tuple, TypeVar, Union, Optional, NamedTuple, Iterator
 )
 
 from mypy.errors import Errors, report_internal_error
@@ -59,7 +58,7 @@
 
 from mypy import experiments
 
-if TYPE_CHECKING:
+if MYPY:
     from mypy.options import Options
 
 T = TypeVar('T')

mypy/errors.py

@@ -4,11 +4,13 @@
 from collections import OrderedDict, defaultdict
 from contextlib import contextmanager
 
-from typing import Tuple, List, TypeVar, Set, Dict, Iterator, Optional, TYPE_CHECKING
+from typing import Tuple, List, TypeVar, Set, Dict, Iterator, Optional
 
 from mypy.version import __version__ as mypy_version
 
-if TYPE_CHECKING:
+# 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')

mypy/parse.py

@@ -1,9 +1,11 @@
-from typing import List, Tuple, Set, cast, Union, Optional, TYPE_CHECKING
+from typing import List, Tuple, Set, cast, Union, Optional
 
 from mypy.errors import Errors
 from mypy.nodes import MypyFile
 
-if TYPE_CHECKING:
+# 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
 
 

mypy/report.py

@@ -8,7 +8,7 @@
 import tokenize
 from operator import attrgetter
 
-from typing import Any, Callable, Dict, List, Optional, Tuple, cast, TYPE_CHECKING
+from typing import Any, Callable, Dict, List, Optional, Tuple, cast
 
 import time
 
@@ -20,7 +20,9 @@
 from mypy.types import Type
 from mypy.version import __version__
 
-if TYPE_CHECKING:
+# 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
 
 try:

mypy/semanal.py

@@ -48,7 +48,6 @@
 
 from typing import (
     List, Dict, Set, Tuple, cast, TypeVar, Union, Optional, Callable, Iterator,
-    TYPE_CHECKING
 )
 
 from mypy.nodes import (
@@ -92,7 +91,9 @@
 from mypy.sametypes import is_same_type
 from mypy import join
 
-if TYPE_CHECKING:
+# 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')