Accept compatible dict in place of TypedDict

python · ilevkivskyi · Mar 31, 2017 · Mar 20, 2017 · Mar 20, 2017 · Mar 21, 2017
commit 5bd90ea2ee538f77e8ff2c247ab6d053ffdcbcbf
diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py
@@ -1694,6 +1694,13 @@ def visit_dict_expr(self, e: DictExpr) -> Type:
 
        Translate it into a call to dict(), with provisions for **expr.
         """
+        if isinstance(self.type_context[-1], TypedDictType):
+            return self.check_typeddict_call_with_dict(
+                callee=self.type_context[-1],
+                kwargs=e,
+                context=e
+            )
+
         # Collect function arguments, watching out for **expr.
         args = []  # type: List[Expression]  # Regular "key: value"
         stargs = []  # type: List[Expression]  # For "**expr"

diff --git a/mypy/test/data.py b/mypy/test/data.py
@@ -379,7 +379,7 @@ def expand_errors(input: List[str], output: List[str], fnam: str) -> None:
         # The first in the split things isn't a comment
         for possible_err_comment in input[i].split('#')[1:]:
             m = re.search(
-                '^([ENW]):((?P<col>\d+):)? (?P<message>.*)$',
+                '^([ENW]):((?P<col>\d+):)?((?P<backtrack>-\d+):)? (?P<message>.*)$',
                 possible_err_comment.strip())
             if m:
                 if m.group(1) == 'E':
@@ -389,12 +389,14 @@ def expand_errors(input: List[str], output: List[str], fnam: str) -> None:
                 elif m.group(1) == 'W':
                     severity = 'warning'
                 col = m.group('col')
+                backtrack = int(m.group('backtrack')) if m.group('backtrack') is not None else 0
                 if col is None:
                     output.append(
-                        '{}:{}: {}: {}'.format(fnam, i + 1, severity, m.group('message')))
+                        '{}:{}: {}: {}'.format(fnam, i + 1 + backtrack,
+                                               severity, m.group('message')))
                 else:
                     output.append('{}:{}:{}: {}: {}'.format(
-                        fnam, i + 1, col, severity, m.group('message')))
+                        fnam, i + 1 + backtrack, col, severity, m.group('message')))
 
 
 def fix_win_path(line: str) -> str:

diff --git a/test-data/unit/README.md b/test-data/unit/README.md
@@ -29,7 +29,11 @@ Add the test in this format anywhere in the file:
 - `# E: abc...` indicates that this line should result in type check error
 with text "abc..."
 - note a space after `E:` and `flags:`
-- lines without `# E: ` should cause no type check errors
+- `# E:12` adds column number to the expected error
+- `# E:-1` means that the error was expected 2 lines ago (helpful for multiple errors in a line)
+- `# E:12:-1` combines the two options above
+- `W: ...` and `N: ...` works exactly like `E:`, but report a warning and a note respectively
+- lines that don't contain the above should cause no type check errors
 - optional `[builtins fixtures/...]` tells the type checker to use
 stubs from the indicated file (see Fixtures section below)
 - optional `[out]` is an alternative to the "# E:" notation: it indicates that

diff --git a/test-data/unit/check-typeddict.test b/test-data/unit/check-typeddict.test
@@ -610,3 +610,26 @@ def f() -> None:
     A = TypedDict('A', {'x': int})
 A  # E: Name 'A' is not defined
 [builtins fixtures/dict.pyi]
+
+
+-- Use dict literals
+
+[case testTypedDictDictLiterals]
+from mypy_extensions import TypedDict
+
+Point = TypedDict('Point', {'x': int, 'y': int})
+
+def f(p: Point) -> None:
+    p = {'x': 2, 'y': 3}
+    p = {'x': 2}  # E: Expected items ['x', 'y'] but found ['x'].
+    p = dict(x=2, y=3)
+
+f({'x': 1, 'y': 3})
+f({'x': 1, 'y': 'z'})  # E: Argument 1 to "f" has incompatible type "TypedDict(x=int, y=str)"; expected "Point"
+# E:-1: Incompatible types (expression has type "str", TypedDict item "y" has type "int")
+
+f(dict(x=1, y=3))
+f(dict(x=1, y=3, z=4))  # E: Expected items ['x', 'y'] but found ['x', 'y', 'z'].
+
+[builtins fixtures/dict.pyi]
+