Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

unittest.mock: use ParamSpec in patch #10325

Merged
merged 5 commits into from
Jun 20, 2023
Merged

unittest.mock: use ParamSpec in patch #10325

merged 5 commits into from
Jun 20, 2023

Conversation

hauntsaninja
Copy link
Collaborator

Fixes #10324

@github-actions

This comment has been minimized.

Sign in to view
srittau
srittau reviewed Jun 16, 2023
View reviewed changes
stdlib/unittest/mock.pyi
@@ -234,7 +235,7 @@ class _patch(Generic[_T]):
@overload
def __call__(self, func: _TT) -> _TT: ...
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need this overload anymore as types should be callable. But can't hurt to add another test for that.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we still do, so that you can resolve attributes of the class. Note that this only matters when using pyright, since mypy sort of ignores class decorators. I'll add a test case though!

@hauntsaninja hauntsaninja marked this pull request as ready for review June 18, 2023 20:26
@github-actions
Copy link
Contributor

According to mypy_primer, this change has no effect on the checked open source code. 🤖🎉

@srittau srittau merged commit 9e86c60 into python:main Jun 20, 2023
@AlexWaygood
Copy link
Member

Pyright now seems broken on main -- it looks like for some reason, pre-commit was the only check that was run on the last commit on this PR? (We didn't get any GitHub Actions on it for some reason -- I assume this was due to GitHub flakiness?)

@AlexWaygood
Copy link
Member

https://github.com/python/typeshed/actions/runs/5322153767/jobs/9638207422

AlexWaygood added a commit that referenced this pull request Jun 20, 2023
@AlexWaygood
Delete static assertion that fails with pyright
633f2f5 
See #10325 (comment)
@AlexWaygood AlexWaygood mentioned this pull request Jun 20, 2023
Merged
AlexWaygood added a commit that referenced this pull request Jun 20, 2023
@AlexWaygood @JelleZijlstra
Replace static assertion that fails with pyright (#10335)
8ec2323 
See #10325 (comment)

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
@srittau
Copy link
Collaborator

srittau commented Jun 20, 2023 •
edited
Loading

The error message:

/home/runner/work/typeshed/typeshed/test_cases/stdlib/check_unittest.py:117:13 - error: "assert_type" mismatch: expected "() -> int" but received "() -> int"

This doesn't make much sense to me. @erictraut Could you have a look?

Edit: This has been worked around in main now, so no priority.

erictraut pushed a commit to microsoft/pyright that referenced this pull request Jun 20, 2023
@msfterictraut
Fixed a bug that caused an incorrect false positive error for an `ass…
7590c25 
…ert_type` call involving a `Callable[[], X]` type. Pyright was generating a signature with a positional-only separator in this case. This addresses python/typeshed#10325 (comment).
@erictraut erictraut mentioned this pull request Jun 20, 2023
Merged
erictraut added a commit to microsoft/pyright that referenced this pull request Jun 20, 2023
@erictraut @msfterictraut
Fixed a bug that caused an incorrect false positive error for an `ass…
9cbe8c0 
…ert_type` call involving a `Callable[[], X]` type. Pyright was generating a signature with a positional-only separator in this case. This addresses python/typeshed#10325 (comment). (#5345)

Co-authored-by: Eric Traut <erictr@microsoft.com>
@erictraut
Copy link
Contributor

@srittau, this was a bug in pyright. It will be addressed in pyright 1.1.315, which I'll release this evening. The problem is that when pyright creates a type based on Callable it adds an implicit "positional-only separator" parameter to the end. It shouldn't do this if there are zero parameters specified.

AlexWaygood
AlexWaygood reviewed Jun 20, 2023
View reviewed changes
tests/utils.py
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were the changes to this file just so that the stdlib is always tested first in CI?

(I don't object, just curious! :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I wanted stdlib tested first for lower latency local dev. Makes sense given that it's where most of our test cases are / probably a plurality of changes

Copy link
Member

@AlexWaygood AlexWaygood Jun 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense! You may already know this, but you can also run e.g. python tests/regr_test.py stdlib to run just the stdlib tests :-)

jbradaric added a commit to jbradaric/pyright-inlay-hints that referenced this pull request Jun 20, 2023
@jbradaric
Merge upstream changes
7599cbb 
commit 63f5658
Author: Erik De Bonte <erikd@microsoft.com>
Date:   Tue Jun 20 10:50:18 2023 -0700

    Support PEP 712's new attribute assignment conversion (microsoft#5343)

commit 9cbe8c0
Author: Eric Traut <eric@traut.com>
Date:   Tue Jun 20 09:17:40 2023 -0700

    Fixed a bug that caused an incorrect false positive error for an `assert_type` call involving a `Callable[[], X]` type. Pyright was generating a signature with a positional-only separator in this case. This addresses python/typeshed#10325 (comment). (microsoft#5345)

    Co-authored-by: Eric Traut <erictr@microsoft.com>

commit d12ad6e
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 23:59:08 2023 -0700

    Updated typeshed stubs to the latest version.

commit eff69f5
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 22:35:56 2023 -0700

    Fixed a bug that caused incorrect type inference for parameters in unannotated methods within child classes who derive from a generic parent class. This addresses a bug reported on stack overflow: https://stackoverflow.com/questions/76466874/trouble-specifying-type-parameter-when-inheriting-from-generic-class.

commit 43c5fae
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 20:17:00 2023 -0700

    Finished cleanup of test cases.

commit b0d4080
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 19:15:53 2023 -0700

    Next batch of test case cleanup.

commit efea9b9
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 18:26:49 2023 -0700

    Changed behavior of non-ClassVar variables within a protocol definition. Previously, an error was reported when such variables were accessed from the class (as opposed to an instance of the class). Mypy (which was the reference implementation for PEP 544) does not report an error here. This addresses microsoft/pylance-release#4389.

commit 5568b4d
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 18:00:31 2023 -0700

    Enhanced command-line version of pyright to allow file or directory names to be passed via stdin if `-` option is used in the command line. This addresses microsoft#5342.

commit cd257f7
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 15:38:13 2023 -0700

    Next batch of test case cleanup.

commit 0c5c7b6
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 14:23:50 2023 -0700

    Next batch of text case cleanup.

commit 899799d
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 13:33:41 2023 -0700

    Finished cleaning up "genericTypesX.py" test files.

commit 1111f1b
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 11:49:56 2023 -0700

    Started to untangle the hairball related to the "genericTypesX.py" test cases.

commit 67394ad
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 10:21:36 2023 -0700

    Continued cleanup of test cases.

commit 96e03aa
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 09:39:09 2023 -0700

    Did a cleanup pass for the dataclass test cases. Renamed and reordered test cases for maintainability.

commit b7df200
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 08:20:54 2023 -0700

    Fixed bug that resulted in a false positive error when defining a new type alias using the `TypeAliasType` constructor that defines no new type parameters but references an outer-scoped type parameter in the type alias definition. This addresses microsoft#5341.

commit d816d00
Author: Eric Traut <erictr@microsoft.com>
Date:   Mon Jun 19 00:00:07 2023 -0700

    Started to do a pass over the test cases to make them more consistent.

commit 23bcbce
Author: Eric Traut <erictr@microsoft.com>
Date:   Sun Jun 18 17:42:25 2023 -0700

    Fixed bug in code flow engine that led to incorrect type evaluation of a variable in a nested loop. This addresses https://github.com/microsoft/pylance-release/issues/4509.

commit 056415f
Author: Eric Traut <erictr@microsoft.com>
Date:   Sun Jun 18 16:40:00 2023 -0700

    Fixed a bug in the control flow debugging code that prints the control flow graph. It was not correctly handling one of the node types which led to incomplete graphs.

commit 643bb1d
Author: Eric Traut <eric@traut.com>
Date:   Sun Jun 18 13:20:49 2023 -0700

    Improved type inference for lambdas in the case where a parameter includes a default value and the expected type doesn't include that parameter. This improvement was suggested in the [mypy issue tracker](python/mypy#15459). (microsoft#5337)

    Co-authored-by: Eric Traut <erictr@microsoft.com>

commit 8ce23eb
Author: Eric Traut <eric@traut.com>
Date:   Sun Jun 18 12:55:22 2023 -0700

    Improved `reportUnnecessaryCast` so it works with types other than cl… (microsoft#5336)

    Improved `reportUnnecessaryCast` so it works with types other than class instances. This addresses microsoft#5333.

commit 52c8cac
Author: Eric Traut <erictr@microsoft.com>
Date:   Sun Jun 18 12:41:24 2023 -0700

    Changed type printer (the component that renders types into text) to use the lowercase `type[x]` instead of `Type[x]`. It has now been four years since PEP 585 deprecated the use of the upper-case version, so most developers should be getting comfortable with the lowercase version at this point.

commit e3080b1
Author: Eric Traut <eric@traut.com>
Date:   Sun Jun 18 10:15:58 2023 -0700

    Fixed a bug that led to a false positive error under certain circumstances when a literal type argument was used in conjunction with a protocol that used a covariant type parameter and an implementation of that protocol that used an invariant type parameter. This addresses microsoft#5282. (microsoft#5332)

    Co-authored-by: Eric Traut <erictr@microsoft.com>

commit 2b0f8d2
Author: Eric Traut <erictr@microsoft.com>
Date:   Sun Jun 18 09:46:18 2023 -0700

    Improved hover text to display the calculated variance for a PEP 695-style class-scoped type variable when the user hovers over the type parameter in the type param list.

commit 02b7769
Author: Eric Traut <eric@traut.com>
Date:   Sun Jun 18 00:17:53 2023 -0700

    Fixed a false positive error arising from the use of a binary expression for a base class in a class declaration statement. This addresses microsoft#5326. (microsoft#5331)

    Co-authored-by: Eric Traut <erictr@microsoft.com>

commit 2de35e3
Author: Eric Traut <erictr@microsoft.com>
Date:   Sun Jun 18 00:00:06 2023 -0700

    Added documentation about higher-order functions.

commit 42a37f4
Author: Eric Traut <erictr@microsoft.com>
Date:   Sat Jun 17 23:38:50 2023 -0700

    Re-enabled a test case that was previously disabled because it was broken.

commit 7ea11a1
Author: Eric Traut <erictr@microsoft.com>
Date:   Sat Jun 17 23:17:32 2023 -0700

    Minor code cleanup — rename constant for clarity and refactor validation function. No functional change.

commit 53cb3f9
Author: Eric Traut <erictr@microsoft.com>
Date:   Sat Jun 17 23:00:49 2023 -0700

    Improved consistency of parameter ordering internally to type evaluator. No functional change.

commit 9bf8231
Author: Eric Traut <eric@traut.com>
Date:   Sat Jun 17 22:48:18 2023 -0700

    Fixed a bug that led to incorrect type evaluation when passing a generic class (with a constructor that includes class-scoped TypeVars) as an argument for a callable parameter. The class was being specialized prematurely (with type arguments set to `Unknown`) before the constraint solver was able to solve the higher-order function's type variables. This addresses microsoft#5324. (microsoft#5328)

    Co-authored-by: Eric Traut <erictr@microsoft.com>

commit 47cd514
Author: Eric Traut <eric@traut.com>
Date:   Sat Jun 17 22:21:52 2023 -0700

    Changed auto-variance algorithm to ignore `__new__` and `__init__` methods for purposes of calculating the variance of a TypeVar. This mirrors the behavior of mypy. (microsoft#5327)

    Co-authored-by: Eric Traut <erictr@microsoft.com>

commit 3021b9c
Author: Eric Traut <erictr@microsoft.com>
Date:   Sat Jun 17 21:52:57 2023 -0700

    Minor code cleanup — removed dead code and converted lambda to function. No functional change.

commit 327ce37
Author: Eric Traut <erictr@microsoft.com>
Date:   Sat Jun 17 20:30:36 2023 -0700

    Added test case for microsoft#5027.

commit 0559382
Author: Eric Traut <eric@traut.com>
Date:   Sat Jun 17 14:19:12 2023 -0700

    Fixed false negative when a literal and non-literal are assigned to the same TypeVar in an invariant context. This addresses microsoft#5321. (microsoft#5323)

    Co-authored-by: Eric Traut <erictr@microsoft.com>

commit 2829429
Author: Eric Traut <eric@traut.com>
Date:   Sat Jun 17 12:33:13 2023 -0700

    Fixed bug that led to an incorrect type evaluation for nested call expressions where an inner call expression used a ParamSpec. This addresses microsoft#5281. (microsoft#5322)

    Co-authored-by: Eric Traut <erictr@microsoft.com>
@FasterSpeeding FasterSpeeding mentioned this pull request Jun 21, 2023
Merged
@srittau
Copy link
Collaborator

srittau commented Jun 21, 2023

Thanks again, @erictraut, for the super fast response!

@hauntsaninja hauntsaninja deleted the mock branch July 7, 2023 06:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlexWaygood AlexWaygood AlexWaygood left review comments

@srittau srittau srittau approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@hauntsaninja @AlexWaygood @srittau @erictraut