Set local_partial_types correctly

python · JukkaL · Feb 20, 2018 · Jan 22, 2018 · Feb 7, 2018 · Feb 7, 2018
commit 9059894a3debf95173c5a78f4cf5e21bc15490a7
diff --git a/mypy/dmypy_server.py b/mypy/dmypy_server.py
@@ -111,6 +111,10 @@ def __init__(self, flags: List[str]) -> None:
                 options.cache_fine_grained = True  # set this so that cache options match
             else:
                 options.cache_dir = os.devnull
+            options.cache_dir = os.devnull
+            # Fine-grained incremental doesn't support general partial types
+            # (details in https://github.com/python/mypy/issues/4492)
+            options.local_partial_types = True
 
     def serve(self) -> None:
         """Serve requests, synchronously (no thread or fork)."""

diff --git a/mypy/main.py b/mypy/main.py
@@ -506,10 +506,6 @@ def add_invertible_flag(flag: str,
             parser.error("Can only find occurrences of class members.")
         if len(experiments.find_occurrences) != 2:
             parser.error("Can only find occurrences of non-nested class members.")
-    if options.fine_grained_incremental:
-        # Fine-grained incremental doesn't support general partial types
-        # (details in https://github.com/python/mypy/issues/4492)
-        options.local_partial_types = True
 
     # Set reports.
     for flag, val in vars(special_opts).items():

diff --git a/mypy/test/testdmypy.py b/mypy/test/testdmypy.py
@@ -120,6 +120,7 @@ def run_case_once(self, testcase: DataDrivenTestCase, incremental_step: int) ->
             if 'fine-grained' in testcase.file:
                 server_options.append('--experimental')
                 options.fine_grained_incremental = True
+                options.local_partial_types = True
             self.server = dmypy_server.Server(server_options)  # TODO: Fix ugly API
             self.server.options = options
 

diff --git a/mypy/test/testfinegrained.py b/mypy/test/testfinegrained.py
@@ -142,7 +142,7 @@ def build(self,
         options.fine_grained_incremental = not build_cache
         options.use_fine_grained_cache = enable_cache and not build_cache
         options.cache_fine_grained = enable_cache
-
+        options.local_partial_types = True
         main_path = os.path.join(test_temp_dir, 'main')
         with open(main_path, 'w') as f:
             f.write(source)

diff --git a/test-data/unit/check-dmypy-fine-grained.test b/test-data/unit/check-dmypy-fine-grained.test
@@ -181,3 +181,23 @@ tmp/a.py:1: error: "int" not callable
 [delete nonexistent_stub.pyi.2]
 [out1]
 [out2]
+
+[case testPartialNoneTypeFineGrainedIncremental]
+# cmd: mypy -m a b
+[file a.py]
+import b
+b.y
+x = None
+def f() -> None:
+    global x
+    x = ''
+[file b.py]
+y = 0
+[file b.py.2]
+y = ''
+[out1]
+tmp/a.py:3: error: Need type annotation for 'x'
+tmp/a.py:6: error: Incompatible types in assignment (expression has type "str", variable has type "None")
+[out2]
+tmp/a.py:3: error: Need type annotation for 'x'
+tmp/a.py:6: error: Incompatible types in assignment (expression has type "str", variable has type "None")
diff --git a/test-data/unit/fine-grained.test b/test-data/unit/fine-grained.test
@@ -1796,3 +1796,54 @@ def foo(x: Point) -> int:
 [out]
 ==
 b.py:3: error: Unsupported operand types for + ("int" and "str")
+
+[case testNonePartialType]
+import a
+a.y
+
+x = None
+
+def f() -> None:
+    global x
+    x = 1
+[file a.py]
+y = 0
+[file a.py.2]
+y = ''
+[out]
+main:4: error: Need type annotation for 'x'
+main:8: error: Incompatible types in assignment (expression has type "int", variable has type "None")
+==
+main:4: error: Need type annotation for 'x'
+main:8: error: Incompatible types in assignment (expression has type "int", variable has type "None")
+
+[case testNonePartialType2]
+import a
+a.y
+
+x = None
+
+def f():
+    global x
+    x = 1
+[file a.py]
+y = 0
+[file a.py.2]
+y = ''
+[out]
+main:4: error: Need type annotation for 'x'
+==
+main:4: error: Need type annotation for 'x'
+
+[case testNonePartialType3]
+import a
+[file a.py]
+[file a.py.2]
+y = None
+def f() -> None:
+    global y
+    y = ''
+[out]
+==
+a.py:1: error: Need type annotation for 'y'
+a.py:4: error: Incompatible types in assignment (expression has type "str", variable has type "None")