Skip to content

bpo-41218: Only mark async code with CO_COROUTINE.#21357

Merged
ambv merged 1 commit into
python:masterfrom
Carreau:no-coro
Jul 6, 2020
Merged

bpo-41218: Only mark async code with CO_COROUTINE.#21357
ambv merged 1 commit into
python:masterfrom
Carreau:no-coro

Conversation

@Carreau

@Carreau Carreau commented Jul 6, 2020 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

3.8.3 had a regression where compiling with
ast.PyCF_ALLOW_TOP_LEVEL_AWAIT would agressively mark things are
coroutine even if there were not.

https://bugs.python.org/issue41218

pablogsal
pablogsal reviewed Jul 6, 2020
View reviewed changes
Comment thread Python/compile.c Outdated
pablogsal
pablogsal reviewed Jul 6, 2020
View reviewed changes
Comment thread Lib/test/test_builtin.py Outdated
@pablogsal

pablogsal commented Jul 6, 2020

Copy link
Copy Markdown
Member

@Carreau Could you add also a NEWS entry?

@Carreau
bpo-41218: Only mark async code with CO_COROUTINE.
f035498 
3.8.3 had a regression where compiling with
ast.PyCF_ALLOW_TOP_LEVEL_AWAIT woudl agressively mark things are
coroutine even if there were not.
@Carreau

Carreau commented Jul 6, 2020

Copy link
Copy Markdown
Contributor Author

Rebased, NEWS file added and suggestion applied.

@pablogsal

pablogsal commented Jul 6, 2020

Copy link
Copy Markdown
Member

Thanks for the quick response @Carreau!

@ambv Could it be possible to include this in 3.8.4?

@ambv

ambv commented Jul 6, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

Could it be possible to include this in 3.8.4?

How could it not?

@ambv
ambv merged commit bd46174 into python:master Jul 6, 2020
@bedevere-bot

bedevere-bot commented Jul 6, 2020

Copy link
Copy Markdown

@ambv: Please replace # with GH- in the commit message next time. Thanks!

@miss-islington

miss-islington commented Jul 6, 2020

Copy link
Copy Markdown
Contributor

Thanks @Carreau for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8, 3.9.
🐍🍒⛏🤖

@miss-islington

miss-islington commented Jul 6, 2020

Copy link
Copy Markdown
Contributor

Sorry @Carreau and @ambv, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker bd46174a5a09a54e5ae1077909f923f56a7cf710 3.9

@bedevere-bot

bedevere-bot commented Jul 6, 2020

Copy link
Copy Markdown

GH-21361 is a backport of this pull request to the 3.8 branch.

@ambv

ambv commented Jul 6, 2020

Copy link
Copy Markdown
Contributor

@pablogsal, approving first, reviewing later is a new style for me ;-)

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 6, 2020
@Carreau @miss-islington
bpo-41218: Only mark async code with CO_COROUTINE. (pythonGH-21357)
7e580e7 
3.8.3 had a regression where compiling with
ast.PyCF_ALLOW_TOP_LEVEL_AWAIT woudl agressively mark things are
coroutine even if there were not.
(cherry picked from commit bd46174)

Co-authored-by: Matthias Bussonnier <bussonniermatthias@gmail.com>
@pablogsal

pablogsal commented Jul 6, 2020

Copy link
Copy Markdown
Member

@pablogsal, approving first, reviewing later is a new style for me ;-)

I forgot to add a couple of suggestions to clean the test suite, I will submit a followup :)

pablogsal pushed a commit to pablogsal/cpython that referenced this pull request Jul 6, 2020
@Carreau @pablogsal
[3.9] bpo-41218: Only mark async code with CO_COROUTINE. (pythonGH-21357
4c6299a 
)

3.8.3 had a regression where compiling with
ast.PyCF_ALLOW_TOP_LEVEL_AWAIT woudl agressively mark things are
coroutine even if there were not.
(cherry picked from commit bd46174)

Co-authored-by: Matthias Bussonnier <bussonniermatthias@gmail.com>
@bedevere-bot

bedevere-bot commented Jul 6, 2020

Copy link
Copy Markdown

GH-21362 is a backport of this pull request to the 3.9 branch.

miss-islington added a commit that referenced this pull request Jul 6, 2020
@miss-islington @Carreau
bpo-41218: Only mark async code with CO_COROUTINE. (GH-21357)
41db8ff 
3.8.3 had a regression where compiling with
ast.PyCF_ALLOW_TOP_LEVEL_AWAIT woudl agressively mark things are
coroutine even if there were not.
(cherry picked from commit bd46174)

Co-authored-by: Matthias Bussonnier <bussonniermatthias@gmail.com>
pablogsal added a commit that referenced this pull request Jul 6, 2020
@pablogsal @Carreau
[3.9] bpo-41218: Only mark async code with CO_COROUTINE. (GH-21357) (G…
6488a4a 
…H-21362)

3.8.3 had a regression where compiling with
ast.PyCF_ALLOW_TOP_LEVEL_AWAIT woudl agressively mark things are
coroutine even if there were not.
(cherry picked from commit bd46174)

Co-authored-by: Matthias Bussonnier <bussonniermatthias@gmail.com>

Co-authored-by: Matthias Bussonnier <bussonniermatthias@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pablogsal pablogsal pablogsal approved these changes

Assignees

@ambv ambv

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@Carreau @pablogsal @ambv @bedevere-bot @miss-islington @the-knights-who-say-ni