Skip to content

Fix regression when a contextmanager yields a generic#11870

Merged
JukkaL merged 1 commit intopython:masterfrom
asottile:fix-generator-contextmanager-generics
Jan 5, 2022
Merged

Fix regression when a contextmanager yields a generic#11870
JukkaL merged 1 commit intopython:masterfrom
asottile:fix-generator-contextmanager-generics

Conversation

@asottile
Copy link
Contributor

@asottile asottile commented Dec 29, 2021

Description

resolves #11852

I had to back out some of the tests added in the patch which regressed this behaviour -- once I had "fixed" them they were identical to existing tests

I added a new test to cover the behaviour that had regressed. I had to simplify it a bit from the one in the issue due to missing fixtures

Test Plan

automated tests in the patch itself -- the added test fails on master:

___________________ testContextManagerReturnsGenericFunction ___________________
[gw2] linux -- Python 3.7.12 /tmp/mypy/.tox/py37/bin/python
data: /tmp/mypy/test-data/unit/check-default-plugin.test:45:
../mypy/mypy/test/testcheck.py:140: in run_case
    self.run_case_once(testcase)
../mypy/mypy/test/testcheck.py:227: in run_case_once
    assert_string_arrays_equal(output, a, msg.format(testcase.file, testcase.line))
E   AssertionError: Unexpected type checker output (/tmp/mypy/test-data/unit/check-default-plugin.test, line 45)
----------------------------- Captured stderr call -----------------------------
Expected:
  main:26: note: Revealed type is "builtins.list[builtins.int*]" (diff)
Actual:
  main:24: error: Need type annotation for "m"  (diff)
  main:26: note: Revealed type is "builtins.list[Any]" (diff)

Alignment of first line difference:
  E: main:26: note: Revealed type is "builtins.list[builtins.int*]"
  A: main:24: error: Need type annotation for "m"
           ^

@asottile asottile mentioned this pull request Dec 29, 2021
Closed
@hauntsaninja hauntsaninja mentioned this pull request Dec 30, 2021
Closed
JukkaL
JukkaL approved these changes Jan 5, 2022
View reviewed changes
Copy link
Collaborator

@JukkaL JukkaL left a comment

Choose a reason for hiding this comment

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

Thanks for the fix! Looks good.

@JukkaL JukkaL merged commit 06afa7c into python:master Jan 5, 2022
@asottile asottile deleted the fix-generator-contextmanager-generics branch January 5, 2022 16:47
JukkaL pushed a commit that referenced this pull request Jan 5, 2022
@asottile @JukkaL
Fix regression when a contextmanager yields a generic (#11870)
bc22e2a 
Resolves #11852
tushar-deepsource pushed a commit to DeepSourceCorp/mypy that referenced this pull request Jan 20, 2022
@asottile @tushar-deepsource
Fix regression when a contextmanager yields a generic (python#11870)
a3e890f 
Resolves python#11852
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JukkaL JukkaL JukkaL approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

mypy 0.930: regression: no longer keeping contextmanager generic return value

2 participants

@asottile @JukkaL