Merge upstream/master (464b553)

Author: Guido van Rossum

docs/source/cheat_sheet.rst

@@ -1,7 +1,7 @@
 .. _cheat-sheet-py2:
 
-Mypy syntax cheat sheet (Python 2)
-==================================
+Type hints cheat sheet (Python 2)
+=================================
 
 This document is a quick cheat sheet showing how the `PEP 484 <https://www.python.org/dev/peps/pep-0484/>`_ type
 language represents various common types in Python 2.

docs/source/cheat_sheet_py3.rst

@@ -1,7 +1,7 @@
 .. _cheat-sheet-py3:
 
-Mypy syntax cheat sheet (Python 3)
-==================================
+Type hints cheat sheet (Python 3)
+=================================
 
 This document is a quick cheat sheet showing how the `PEP 484 <https://www.python.org/dev/peps/pep-0484/>`_ type
 language represents various common types in Python 3. Unless otherwise noted, the syntax is valid on all versions of Python 3.

docs/source/index.rst

@@ -10,31 +10,53 @@ Mypy is a static type checker for Python 3 and Python 2.7.
 
 .. toctree::
    :maxdepth: 2
+   :caption: First steps
 
    introduction
    basics
    getting_started
-   builtin_types
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Cheat sheets
+
+   cheat_sheet_py3
+   cheat_sheet
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Type system reference
+
    python2
+   builtin_types
    type_inference_and_annotations
    kinds_of_types
    class_basics
    dynamic_typing
    function_overloading
    casts
    duck_type_compatibility
-   common_issues
    generics
-   supported_python_features
-   additional_features
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Configuring and running mypy
+
    command_line
    config_file
    mypy_daemon
+   supported_python_features
    python36
+   additional_features
+
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Miscellaneous
+
    installed_packages
+   common_issues
    faq
-   cheat_sheet
-   cheat_sheet_py3
    revision_history
 
 Indices and tables

mypy/nodes.py

@@ -2487,6 +2487,18 @@ class SymbolTableNode:
             (This is currently used for simple aliases like `A = int` instead
             of .type_override)
         alias_name: TODO
+        no_serialize: Do not serialize this node if True. This is used to prevent
+            keys in the cache that refer to modules on which this file does not
+            depend. Currently this can happen if there is a module not in build
+            used e.g. like this:
+                import a.b.c # type: ignore
+            This will add a submodule symbol to parent module `a` symbol table,
+            but `a.b` is _not_ added as its dependency. Therefore, we should
+            not serialize these symbols as they may not be found during fixup
+            phase, instead they will be re-added during subsequent patch parents
+            phase.
+            TODO: Refactor build.py to make dependency tracking more transparent
+            and/or refactor look-up functions to not require parent patching.
     """
 
     __slots__ = ('kind',
@@ -2500,6 +2512,7 @@ class SymbolTableNode:
                  'implicit',
                  'is_aliasing',
                  'alias_name',
+                 'no_serialize',
                  )
 
     # TODO: This is a mess. Refactor!
@@ -2513,7 +2526,9 @@ def __init__(self,
                  normalized: bool = False,
                  alias_tvars: Optional[List[str]] = None,
                  implicit: bool = False,
-                 module_hidden: bool = False) -> None:
+                 module_hidden: bool = False,
+                 *,
+                 no_serialize: bool = False) -> None:
         self.kind = kind
         self.node = node
         self.type_override = typ
@@ -2525,6 +2540,7 @@ def __init__(self,
         self.cross_ref = None  # type: Optional[str]
         self.is_aliasing = False
         self.alias_name = None  # type: Optional[str]
+        self.no_serialize = no_serialize
 
     @property
     def fullname(self) -> Optional[str]:
@@ -2660,7 +2676,7 @@ def serialize(self, fullname: str) -> JsonDict:
             # module that gets added to every module by
             # SemanticAnalyzerPass2.visit_file(), but it shouldn't be
             # accessed by users of the module.
-            if key == '__builtins__':
+            if key == '__builtins__' or value.no_serialize:
                 continue
             data[key] = value.serialize(fullname, key)
         return data

mypy/semanal.py

@@ -1301,7 +1301,8 @@ def add_submodules_to_parent_modules(self, id: str, module_public: bool) -> None
                 child_mod = self.modules.get(id)
                 if child_mod:
                     sym = SymbolTableNode(MODULE_REF, child_mod,
-                                          module_public=module_public)
+                                          module_public=module_public,
+                                          no_serialize=True)
                     parent_mod.names[child] = sym
             id = parent
 

mypy/server/aststrip.py

@@ -213,9 +213,7 @@ def visit_import(self, node: Import) -> None:
             for name, as_name in node.ids:
                 imported_name = as_name or name
                 initial = imported_name.split('.')[0]
-                symnode = self.names[initial]
-                symnode.kind = UNBOUND_IMPORTED
-                symnode.node = None
+                self.names[initial] = SymbolTableNode(UNBOUND_IMPORTED, None)
 
     def visit_import_all(self, node: ImportAll) -> None:
         # Imports can include both overriding symbols and fresh ones,

mypy/test/data.py

@@ -578,6 +578,8 @@ def pytest_addoption(parser: Any) -> None:
     group.addoption('--update-data', action='store_true', default=False,
                     help='Update test data to reflect actual output'
                          ' (supported only for certain tests)')
+    group.addoption('--mypy-verbose', action='count',
+                    help='Set the verbose flag when creating mypy Options')
 
 
 # This function name is special to pytest.  See

mypy/test/helpers.py

@@ -347,6 +347,9 @@ def parse_options(program_text: str, testcase: DataDrivenTestCase,
             all(flag not in flag_list for flag in ['--python-version', '-2', '--py2'])):
         options.python_version = testcase_pyversion(testcase.file, testcase.name)
 
+    if testcase.config.getoption('--mypy-verbose'):
+        options.verbosity = testcase.config.getoption('--mypy-verbose')
+
     return options
 
 

test-data/unit/README.md

@@ -171,6 +171,10 @@ need to pass the `-n0` option to disable parallelization:
 You can also write `import pdb; pdb.set_trace()` in code to enter the
 debugger.
 
+The `--mypy-verbose` flag can be used to enable additional debug output from
+most tests (as if `--verbose` had been passed to mypy):
+
+    $ pytest -n0 --mypy-verbose -k MethodCall
 
 Coverage reports
 ----------------

test-data/unit/check-incremental.test

@@ -4358,10 +4358,27 @@ import b
 [file b.py.2]
 # uh
 -- b gets rechecked because it changed, but nothing is stale
--- since the interface didn't change
+-- since the interface did not change
 [stale]
 [rechecked b]
 
+[case testParentPatchingMess]
+# flags: --ignore-missing-imports --follow-imports=skip
+# cmd: mypy -m d d.k d.k.a d.k.v t
+[file d/__init__.py]
+[file d/k/__init__.py]
+from d.k.a import x
+[file d/k/a.py]
+x = 10
+[file d/k/v.py]
+from d.k.e import x
+
+[file t.py]
+from d import k
+[file t.py.2]
+from d import k
+# dummy change
+
 [case testBazelFlagIgnoresFileChanges]
 -- Since the initial run wrote a cache file, the second run ignores the source
 # flags: --bazel