Merge branch 'master' into refine-enum-branch-analysis

Author: Michael0x2a

docs/source/command_line.rst

@@ -622,6 +622,19 @@ Miscellaneous
     have many scripts that import a large package, the behavior enabled
     by this flag is often more convenient.)
 
+``--new-semantic-analyzer``
+    This flag switches to an improved, experimental implementation of
+    the *semantic analyzer* (the part of mypy that binds Python
+    names to definitions). The old and the new semantic analyzers
+    mostly behave identically. The new semantic analyzer is better at
+    handling import cycles and forward references to definitions. It
+    also fixes inconsistencies between the daemon and non-daemon modes,
+    and it detects additional error conditions.
+
+    Likely, the next mypy release will use the new semantic analyzer by
+    default, and the old semantic analyzer will be removed in the next
+    release after that.
+
 .. _PEP 420: https://www.python.org/dev/peps/pep-0420/
 
 .. _PEP 561: https://www.python.org/dev/peps/pep-0561/

docs/source/common_issues.rst

@@ -456,8 +456,8 @@ to see the types of all local variables at once. Example:
    b = 'one'
    reveal_locals()
    # Revealed local types are:
-   # a: builtins.int
-   # b: builtins.str
+   #     a: builtins.int
+   #     b: builtins.str
 .. note::
 
    ``reveal_type`` and ``reveal_locals`` are only understood by mypy and

docs/source/config_file.rst

@@ -294,7 +294,7 @@ Miscellaneous strictness flags
     Allows variables to be redefined with an arbitrary type, as long as the redefinition
     is in the same block and nesting level as the original definition.
 
-``implicit-reexport`` (bool, default True)
+``implicit_reexport`` (bool, default True)
     By default, imported values to a module are treated as exported and mypy allows
     other modules to import them. When false, mypy will not re-export unless
     the item is imported using from-as. Note that mypy treats stub files as if this
@@ -456,3 +456,7 @@ Miscellaneous
 
 ``verbosity`` (integer, default 0)
     Controls how much debug output will be generated.  Higher numbers are more verbose.
+
+``new_semantic_analyzer`` (bool, default False)
+    Enables the experimental new semantic analyzer.
+    (See :ref:`The mypy command line <command-line>` for more information.)

mypy/binder.py

@@ -1,10 +1,8 @@
-from typing import Dict, List, Set, Iterator, Union, Optional, Tuple, cast
 from contextlib import contextmanager
 from collections import defaultdict
 
-MYPY = False
-if MYPY:
-    from typing import DefaultDict
+from typing import Dict, List, Set, Iterator, Union, Optional, Tuple, cast
+from typing_extensions import DefaultDict
 
 from mypy.types import Type, AnyType, PartialType, UnionType, TypeOfAny, NoneType
 from mypy.subtypes import is_subtype
@@ -35,10 +33,7 @@ def __init__(self) -> None:
         self.unreachable = False
 
 
-if MYPY:
-    # This is the type of stored assignments for union type rvalues.
-    # We use 'if MYPY: ...' since typing-3.5.1 does not have 'DefaultDict'
-    Assigns = DefaultDict[Expression, List[Tuple[Type, Optional[Type]]]]
+Assigns = DefaultDict[Expression, List[Tuple[Type, Optional[Type]]]]
 
 
 class ConditionalTypeBinder:

mypy/build.py

@@ -25,11 +25,7 @@
 
 from typing import (AbstractSet, Any, Dict, Iterable, Iterator, List,
                     Mapping, NamedTuple, Optional, Set, Tuple, Union, Callable, TextIO)
-MYPY = False
-if MYPY:
-    from typing import ClassVar
-    from typing_extensions import Final
-
+from typing_extensions import ClassVar, Final, TYPE_CHECKING
 from mypy_extensions import TypedDict
 
 from mypy.nodes import MypyFile, ImportBase, Import, ImportFrom, ImportAll, SymbolTable
@@ -45,7 +41,7 @@
 from mypy.util import (
     DecodeError, decode_python_encoding, is_sub_path, get_mypy_comments, module_prefix
 )
-if MYPY:
+if TYPE_CHECKING:
     from mypy.report import Reports  # Avoid unconditional slow import
 from mypy import moduleinfo
 from mypy.fixup import fixup_module
@@ -1876,20 +1872,17 @@ def patch_dependency_parents(self) -> None:
         details.
 
         However, this patching process can occur after `a` has been parsed and
-        serialized during increment mode. Consequently, we need to repeat this
+        serialized during incremental mode. Consequently, we need to repeat this
         patch when deserializing a cached file.
 
         This function should be called only when processing fresh SCCs -- the
         semantic analyzer will perform this patch for us when processing stale
         SCCs.
         """
-        Analyzer = Union[SemanticAnalyzerPass2, NewSemanticAnalyzer]  # noqa
-        if self.manager.options.new_semantic_analyzer:
-            analyzer = self.manager.new_semantic_analyzer  # type: Analyzer
-        else:
+        if not self.manager.options.new_semantic_analyzer:
             analyzer = self.manager.semantic_analyzer
-        for dep in self.dependencies:
-            analyzer.add_submodules_to_parent_modules(dep, True)
+            for dep in self.dependencies:
+                analyzer.add_submodules_to_parent_modules(dep, True)
 
     def fix_suppressed_dependencies(self, graph: Graph) -> None:
         """Corrects whether dependencies are considered stale in silent mode.

mypy/checker.py

@@ -9,6 +9,7 @@
     Dict, Set, List, cast, Tuple, TypeVar, Union, Optional, NamedTuple, Iterator, Iterable,
     Sequence
 )
+from typing_extensions import Final
 
 from mypy.errors import Errors, report_internal_error
 from mypy.nodes import (
@@ -69,11 +70,6 @@
 from mypy import state
 from mypy.traverser import has_return_statement
 
-MYPY = False
-if MYPY:
-    from typing_extensions import Final
-
-
 T = TypeVar('T')
 
 DEFAULT_LAST_PASS = 1  # type: Final  # Pass numbers start at 0

mypy/checkexpr.py

@@ -5,10 +5,7 @@
 from typing import (
     cast, Dict, Set, List, Tuple, Callable, Union, Optional, Sequence, Iterator
 )
-MYPY = False
-if MYPY:
-    from typing import ClassVar
-    from typing_extensions import Final
+from typing_extensions import ClassVar, Final
 
 from mypy.errors import report_internal_error
 from mypy.typeanal import (

mypy/checkmember.py

@@ -1,6 +1,7 @@
 """Type checking of attribute access"""
 
 from typing import cast, Callable, List, Optional, TypeVar, Union
+from typing_extensions import TYPE_CHECKING
 
 from mypy.types import (
     Type, Instance, AnyType, TupleType, TypedDictType, CallableType, FunctionLike, TypeVarDef,
@@ -25,8 +26,7 @@
 from mypy import meet
 from mypy.typeops import tuple_fallback
 
-MYPY = False
-if MYPY:  # import for forward declaration only
+if TYPE_CHECKING:  # import for forward declaration only
     import mypy.checker
 
 from mypy import state

mypy/checkstrformat.py

@@ -3,6 +3,7 @@
 import re
 
 from typing import cast, List, Tuple, Dict, Callable, Union, Optional, Pattern
+from typing_extensions import Final, TYPE_CHECKING
 
 from mypy.types import (
     Type, AnyType, TupleType, Instance, UnionType, TypeOfAny
@@ -11,12 +12,10 @@
     StrExpr, BytesExpr, UnicodeExpr, TupleExpr, DictExpr, Context, Expression, StarExpr
 )
 
-MYPY = False
-if MYPY:
+if TYPE_CHECKING:
     # break import cycle only needed for mypy
     import mypy.checker
     import mypy.checkexpr
-    from typing_extensions import Final
 from mypy import message_registry
 from mypy.messages import MessageBuilder
 

mypy/config_parser.py

@@ -6,15 +6,11 @@
 import re
 import sys
 
-from mypy import defaults
-from mypy.options import Options, PER_MODULE_OPTIONS
-
 from typing import Any, Dict, List, Mapping, Optional, Tuple, TextIO
+from typing_extensions import Final
 
-
-MYPY = False
-if MYPY:
-    from typing_extensions import Final
+from mypy import defaults
+from mypy.options import Options, PER_MODULE_OPTIONS
 
 
 def parse_version(v: str) -> Tuple[int, int]:

mypy/constraints.py

@@ -1,6 +1,7 @@
 """Type inference constraints."""
 
 from typing import Iterable, List, Optional, Sequence
+from typing_extensions import Final
 
 from mypy.types import (
     CallableType, Type, TypeVisitor, UnboundType, AnyType, NoneType, TypeVarType, Instance,
@@ -15,11 +16,6 @@
 from mypy.nodes import COVARIANT, CONTRAVARIANT
 from mypy.argmap import ArgTypeExpander
 
-MYPY = False
-if MYPY:
-    from typing_extensions import Final
-
-
 SUBTYPE_OF = 0  # type: Final[int]
 SUPERTYPE_OF = 1  # type: Final[int]
 

mypy/defaults.py

@@ -1,8 +1,6 @@
 import os
 
-MYPY = False
-if MYPY:
-    from typing_extensions import Final
+from typing_extensions import Final
 
 PYTHON2_VERSION = (2, 7)  # type: Final
 PYTHON3_VERSION = (3, 6)  # type: Final

mypy/dmypy/client.py

@@ -108,6 +108,8 @@ def __init__(self, prog: str) -> None:
                help="Only produce suggestions that cause no errors")
 p.add_argument('--no-any', action='store_true',
                help="Only produce suggestions that don't contain Any")
+p.add_argument('--try-text', action='store_true',
+               help="Try using unicode wherever str is inferred")
 p.add_argument('--callsites', action='store_true',
                help="Find callsites instead of suggesting a type")
 
@@ -363,7 +365,7 @@ def do_suggest(args: argparse.Namespace) -> None:
     """
     response = request(args.status_file, 'suggest', function=args.function,
                        json=args.json, callsites=args.callsites, no_errors=args.no_errors,
-                       no_any=args.no_any)
+                       no_any=args.no_any, try_text=args.try_text)
     check_output(response, verbose=False, junit_xml=None, perf_stats_file=None)
 
 

mypy/dmypy_server.py

@@ -17,6 +17,7 @@
 from contextlib import redirect_stderr, redirect_stdout
 
 from typing import AbstractSet, Any, Callable, Dict, List, Mapping, Optional, Sequence, Tuple
+from typing_extensions import Final
 
 import mypy.build
 import mypy.errors
@@ -33,11 +34,6 @@
 from mypy.typestate import reset_global_state
 from mypy.version import __version__
 
-
-MYPY = False
-if MYPY:
-    from typing_extensions import Final
-
 MEM_PROFILE = False  # type: Final  # If True, dump memory profile after initialization
 
 if sys.platform == 'win32':

mypy/dmypy_util.py

@@ -6,13 +6,10 @@
 import json
 
 from typing import Any
+from typing_extensions import Final
 
 from mypy.ipc import IPCBase
 
-MYPY = False
-if MYPY:
-    from typing_extensions import Final
-
 DEFAULT_STATUS_FILE = '.dmypy.json'  # type: Final
 
 

mypy/errors.py

@@ -4,15 +4,12 @@
 from collections import OrderedDict, defaultdict
 
 from typing import Tuple, List, TypeVar, Set, Dict, Optional, TextIO
+from typing_extensions import Final
 
 from mypy.scope import Scope
 from mypy.options import Options
 from mypy.version import __version__ as mypy_version
 
-MYPY = False
-if MYPY:
-    from typing_extensions import Final
-
 T = TypeVar('T')
 allowed_duplicates = ['@overload', 'Got:', 'Expected:']  # type: Final
 
@@ -619,7 +616,7 @@ def report_internal_error(err: Exception,
     # Print "INTERNAL ERROR" message.
     print('{}error: INTERNAL ERROR --'.format(prefix),
           'Please try using mypy master on Github:\n'
-          'https://mypy.rtfd.io/en/latest/common_issues.html#using-development-mypy-build',
+          'https://mypy.rtfd.io/en/latest/common_issues.html#using-a-development-mypy-build',
           file=stderr)
     if options.show_traceback:
         print('Please report a bug at https://github.com/python/mypy/issues',

mypy/fastparse.py

@@ -1,13 +1,11 @@
 import re
 import sys
 
+import typing  # for typing.Type, which conflicts with types.Type
 from typing import (
     Tuple, Union, TypeVar, Callable, Sequence, Optional, Any, Dict, cast, List, overload, Set
 )
-MYPY = False
-if MYPY:
-    import typing  # for typing.Type, which conflicts with types.Type
-    from typing_extensions import Final, Literal
+from typing_extensions import Final, Literal
 
 from mypy.sharedparse import (
     special_function_elide_names, argument_elide_name,

mypy/fastparse2.py

@@ -16,11 +16,9 @@
 """
 import sys
 
+import typing  # for typing.Type, which conflicts with types.Type
 from typing import Tuple, Union, TypeVar, Callable, Sequence, Optional, Any, Dict, cast, List, Set
-MYPY = False
-if MYPY:
-    import typing  # for typing.Type, which conflicts with types.Type
-    from typing_extensions import Final, Literal
+from typing_extensions import Final, Literal
 
 from mypy.sharedparse import (
     special_function_elide_names, argument_elide_name,

mypy/find_sources.py

@@ -3,15 +3,12 @@
 import os.path
 
 from typing import List, Sequence, Set, Tuple, Optional, Dict
+from typing_extensions import Final
 
 from mypy.modulefinder import BuildSource, PYTHON_EXTENSIONS
 from mypy.fscache import FileSystemCache
 from mypy.options import Options
 
-MYPY = False
-if MYPY:
-    from typing_extensions import Final
-
 PY_EXTENSIONS = tuple(PYTHON_EXTENSIONS)  # type: Final
 
 

mypy/interpreted_plugin.py

@@ -1,13 +1,14 @@
 """Hack for handling non-mypyc compiled plugins with a mypyc-compiled mypy"""
 
 from typing import Optional, Callable, Any, Dict, List, Tuple
+from typing_extensions import TYPE_CHECKING
+
 from mypy.options import Options
 from mypy.types import Type, CallableType
 from mypy.nodes import SymbolTableNode, MypyFile
 from mypy.lookup import lookup_fully_qualified
 
-MYPY = False
-if MYPY:
+if TYPE_CHECKING:
     import mypy.plugin
 
 

mypy/ipc.py

@@ -11,11 +11,7 @@
 import tempfile
 
 from typing import Optional, Callable
-
-MYPY = False
-if MYPY:
-    from typing import Type
-    from typing_extensions import Final
+from typing_extensions import Final, Type
 
 from types import TracebackType