Merge remote-tracking branch 'upstream/master' into conditional-overloads

Author: cdce8p

.editorconfig

@@ -1,11 +1,11 @@
 root = true
 
-[*.{py,c,cpp,h,rst,md,yml,json}]
+[*.{py,c,cpp,h,rst,md,yml,json,test}]
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 
-[*.{py,c,h,json}]
+[*.{py,c,h,json,test}]
 indent_size = 4
 
 [*.yml]

.github/workflows/mypy_primer_comment.yml

@@ -38,6 +38,9 @@ jobs:
             fs.writeFileSync("diff.zip", Buffer.from(download.data));
 
       - run: unzip diff.zip
+      # 30000 bytes is about 300 lines, posting comment fails if too long
+      - run: |
+          cat diff_*.txt | head -c 30000 | tee fulldiff.txt
 
       # Based on https://github.com/kanga333/comment-hider
       - name: Hide old comments
@@ -77,23 +80,22 @@ jobs:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
             const fs = require('fs')
-            // Keep in sync with shards produced by mypy_primer workflow
-            const data = (
-              ['diff_0.txt', 'diff_1.txt', 'diff_2.txt']
-              .map(fileName => fs.readFileSync(fileName, { encoding: 'utf8' }))
-              .join('')
-              .substr(0, 30000)  // About 300 lines
-            )
+            const data = fs.readFileSync('fulldiff.txt', { encoding: 'utf8' })
 
             console.log("Diff from mypy_primer:")
             console.log(data)
 
+            let body
             if (data.trim()) {
-              const body = 'Diff from [mypy_primer](https://github.com/hauntsaninja/mypy_primer), showing the effect of this PR on open source code:\n```diff\n' + data + '```'
-              await github.issues.createComment({
-                issue_number: fs.readFileSync("pr_number.txt", { encoding: "utf8" }),
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                body
-              })
+              body = 'Diff from [mypy_primer](https://github.com/hauntsaninja/mypy_primer), showing the effect of this PR on open source code:\n```diff\n' + data + '```'
+            } else {
+              body = 'According to [mypy_primer](https://github.com/hauntsaninja/mypy_primer), this change has no effect on the checked open source code. 🤖🎉'
             }
+            const prNumber = parseInt(fs.readFileSync("pr_number.txt", { encoding: "utf8" }))
+            await github.issues.createComment({
+              issue_number: prNumber,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body
+            })
+            return prNumber

mypy/build.py

@@ -511,7 +511,7 @@ def find_config_file_line_number(path: str, section: str, setting_name: str) ->
     in_desired_section = False
     try:
         results = []
-        with open(path) as f:
+        with open(path, encoding="UTF-8") as f:
             for i, line in enumerate(f):
                 line = line.strip()
                 if line.startswith('[') and line.endswith(']'):

mypy/semanal.py

@@ -98,7 +98,7 @@
     CallableType, Overloaded, Instance, Type, AnyType, LiteralType, LiteralValue,
     TypeTranslator, TypeOfAny, TypeType, NoneType, PlaceholderType, TPDICT_NAMES, ProperType,
     get_proper_type, get_proper_types, TypeAliasType, TypeVarLikeType,
-    PROTOCOL_NAMES, TYPE_ALIAS_NAMES, FINAL_TYPE_NAMES, FINAL_DECORATOR_NAMES,
+    PROTOCOL_NAMES, TYPE_ALIAS_NAMES, FINAL_TYPE_NAMES, FINAL_DECORATOR_NAMES, REVEAL_TYPE_NAMES,
     is_named_instance,
 )
 from mypy.typeops import function_type, get_type_vars
@@ -2177,11 +2177,14 @@ def can_be_type_alias(self, rv: Expression, allow_none: bool = False) -> bool:
             return True
         if allow_none and isinstance(rv, NameExpr) and rv.fullname == 'builtins.None':
             return True
-        if (isinstance(rv, OpExpr)
-                and rv.op == '|'
-                and self.can_be_type_alias(rv.left, allow_none=True)
-                and self.can_be_type_alias(rv.right, allow_none=True)):
-            return True
+        if isinstance(rv, OpExpr) and rv.op == '|':
+            if self.is_stub_file:
+                return True
+            if (
+                self.can_be_type_alias(rv.left, allow_none=True)
+                and self.can_be_type_alias(rv.right, allow_none=True)
+            ):
+                return True
         return False
 
     def is_type_ref(self, rv: Expression, bare: bool = False) -> bool:
@@ -3874,7 +3877,7 @@ def visit_call_expr(self, expr: CallExpr) -> None:
             expr.analyzed.line = expr.line
             expr.analyzed.column = expr.column
             expr.analyzed.accept(self)
-        elif refers_to_fullname(expr.callee, 'builtins.reveal_type'):
+        elif refers_to_fullname(expr.callee, REVEAL_TYPE_NAMES):
             if not self.check_fixed_args(expr, 1, 'reveal_type'):
                 return
             expr.analyzed = RevealExpr(kind=REVEAL_TYPE, expr=expr.args[0])

mypy/types.py

@@ -126,6 +126,12 @@
     'typing.Reversible',
 )
 
+REVEAL_TYPE_NAMES: Final = (
+    'builtins.reveal_type',
+    'typing.reveal_type',
+    'typing_extensions.reveal_type',
+)
+
 # A placeholder used for Bogus[...] parameters
 _dummy: Final[Any] = object()
 

mypyc/irbuild/prepare.py

@@ -142,7 +142,7 @@ def prepare_method_def(ir: ClassIR, module_name: str, cdef: ClassDef, mapper: Ma
             ir.method_decls[PROPSET_PREFIX + node.name] = decl
 
         if node.func.is_property:
-            assert node.func.type
+            assert node.func.type, f"Expected return type annotation for property '{node.name}'"
             decl.is_prop_getter = True
             ir.property_types[node.name] = decl.sig.ret_type
 

test-data/unit/check-expressions.test

@@ -1688,6 +1688,22 @@ main:1: note: Revealed type is "Any"
 def reveal_type(x: int) -> None: pass
 reveal_type("foo") # E: Argument 1 to "reveal_type" has incompatible type "str"; expected "int"
 
+[case testTypingRevealType]
+from typing import reveal_type
+from typing import reveal_type as show_me_the_type
+
+reveal_type(1) # N: Revealed type is "Literal[1]?"
+show_me_the_type(1) # N: Revealed type is "Literal[1]?"
+
+[case testTypingExtensionsRevealType]
+from typing_extensions import reveal_type
+from typing_extensions import reveal_type as show_me_the_type
+
+reveal_type(1) # N: Revealed type is "Literal[1]?"
+show_me_the_type(1) # N: Revealed type is "Literal[1]?"
+
+[builtins fixtures/tuple.pyi]
+
 [case testRevealTypeVar]
 reveal_type = 1
 1 + "foo" # E: Unsupported operand types for + ("int" and "str")

test-data/unit/check-union-or-syntax.test

@@ -196,3 +196,30 @@ def f(x: Union[int, str, None]) -> None:
     else:
         reveal_type(x)  # N: Revealed type is "None"
 [builtins fixtures/isinstance.pyi]
+
+[case testImplicit604TypeAliasWithCyclicImportInStub]
+# flags: --python-version 3.10
+from was_builtins import foo
+reveal_type(foo)  # N: Revealed type is "Union[builtins.str, was_mmap.mmap]"
+[file was_builtins.pyi]
+import was_mmap
+WriteableBuffer = was_mmap.mmap
+ReadableBuffer = str | WriteableBuffer
+foo: ReadableBuffer
+[file was_mmap.pyi]
+from was_builtins import *
+class mmap: ...
+
+# TODO: Get this test to pass
+[case testImplicit604TypeAliasWithCyclicImportNotInStub-xfail]
+# flags: --python-version 3.10
+from was_builtins import foo
+reveal_type(foo)  # N: Revealed type is "Union[builtins.str, was_mmap.mmap]"
+[file was_builtins.py]
+import was_mmap
+WriteableBuffer = was_mmap.mmap
+ReadableBuffer = str | WriteableBuffer
+foo: ReadableBuffer
+[file was_mmap.py]
+from was_builtins import *
+class mmap: ...

test-data/unit/cmdline.pyproject.test

@@ -125,3 +125,11 @@ i: int = 0
 This isn't even syntatically valid!
 [file x/please_skipme_.py]
 Neither is this!
+
+[case testPyprojectTOMLUnicode]
+# cmd: mypy x.py
+[file pyproject.toml]
+\[project]
+description = "Factory ⸻ A code generator 🏭"
+\[tool.mypy]
+[file x.py]

test-data/unit/lib-stub/typing.pyi

@@ -47,3 +47,5 @@ class Sequence(Iterable[T_co]):
 class Mapping(Iterable[T], Generic[T, T_co]): pass
 
 def final(meth: T) -> T: pass
+
+def reveal_type(__obj: T) -> T: pass

test-data/unit/lib-stub/typing_extensions.pyi

@@ -44,3 +44,5 @@ class _TypedDict(Mapping[str, object]):
     def __delitem__(self, k: NoReturn) -> None: ...
 
 def TypedDict(typename: str, fields: Dict[str, Type[_T]], *, total: Any = ...) -> Type[dict]: ...
+
+def reveal_type(__obj: T) -> T: pass