8000 bpo-46339: Fix crash in the parser when computing error text for multi-line f-strings by pablogsal · Pull Request #30529 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-46339: Fix crash in the parser when computing error text for multi-line f-strings #30529

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
Merged
merged 2 commits into from
Jan 11, 2022
Merged

bpo-46339: Fix crash in the parser when computing error text for multi-line f-strings #30529

merged 2 commits into from
Jan 11, 2022

Conversation

pablogsal
Copy link
Member
@pablogsal pablogsal commented Jan 11, 2022 •
edited by miss-islington
Loading

https://bugs.python.org/issue46339

Automerge-Triggered-By: GH:pablogsal

isidentical
isidentical approved these changes Jan 11, 2022
View reviewed changes
Copy link
Member
@isidentical isidentical left a comment

Choose a reason for hiding this comment

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

LGTM (a small question below)

pablogsal
pablogsal commented Jan 11, 2022
View reviewed c 8000 hanges
ericsnowcurrently
ericsnowcurrently reviewed Jan 11, 2022
View reviewed changes
@miss-islington
Copy link
Contributor

@pablogsal: Status check is done, and it's a success ✅ .

@miss-islington miss-islington merged commit cedec19 into python:main Jan 11, 2022
@pablogsal pablogsal deleted the bpo-46339 branch January 11, 2022 16:30
@pablogsal pablogsal added the needs backport to 3.10 only security fixes label Jan 11, 2022
@miss-islington
Copy link
Contributor

Thanks @pablogsal for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Jan 11, 2022
@bedevere-bot
Copy link

GH-30542 is a backport of this pull request to the 3.10 branch.

@gpshead gpshead mentioned this pull request Jan 11, 2022
Merged
pablogsal added a commit to miss-islington/cpython that referenced this pull request Jan 11, 2022
@pablogsal
bpo-46339: Fix crash in the parser when computing error text for mult…
9e631ba 
…i-line f-strings (pythonGH-30529)

Automerge-Triggered-By: GH:pablogsal
(cherry picked from commit cedec19)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
pablogsal added a commit that referenced this pull request Jan 20, 2022
@miss-islington @pablogsal
[3.10] bpo-46339: Fix crash in the parser when computing error text f…
1fb1f5d 
…or multi-line f-strings (GH-30529) (GH-30542)

* bpo-46339: Fix crash in the parser when computing error text for multi-line f-strings (GH-30529)

Automerge-Triggered-By: GH:pablogsal
(cherry picked from commit cedec19)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>

* Fix interactive mode

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
@bedevere-bot
Copy link

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot ARM64 macOS 3.10 has failed when building commit 1fb1f5d.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/724/builds/237) and take a look at the build logs.
  4. Check if the failure is related to this commit (1fb1f5d) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/724/builds/237

Summary of the results of the build (if available):

== Tests result: ENV CHANGED ==

407 tests OK.

10 slowest tests:

  • test_concurrent_futures: 3 min 40 sec
  • test_multiprocessing_spawn: 2 min 31 sec
  • test_multiprocessing_forkserver: 1 min 48 sec
  • test_unparse: 1 min 33 sec
  • test_asyncio: 1 min 17 sec
  • test_tokenize: 1 min 11 sec
  • test_lib2to3: 1 min
  • test_logging: 54.1 sec
  • test_capi: 53.1 sec
  • test_unicodedata: 49.1 sec

1 test altered the execution environment:
test_ftplib

16 tests skipped:
test_devpoll test_epoll test_gdb test_ioctl test_msilib
test_multiprocessing_fork test_ossaudiodev test_spwd
test_startfile test_tix test_tk test_ttk_guionly test_winconsoleio
test_winreg test_winsound test_zipfile64

Total duration: 8 min 54 sec

Click to see traceback logs 
Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.10.pablogsal-macos-m1.macos-with-brew/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
    cache[rtype].remove(name)
KeyError: '/psm_8e518a5a'


Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.10.pablogsal-macos-m1.macos-with-brew/build/Lib/threading.py", line 1009, in _bootstrap_inner
    self.run()
  File "/Users/buildbot/buildarea/3.10.pablogsal-macos-m1.macos-with-brew/build/Lib/test/test_ftplib.py", line 298, in run
    asyncore.loop(timeout=0.1, count=1)
  File "/Users/buildbot/buildarea/3.10.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncore.py", line 214, in loop
    poll_fun(timeout, map)
  File "/Users/buildbot/buildarea/3.10.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncore.py", line 157, in poll
    read(obj)
  File "/Users/buildbot/buildarea/3.10.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncore.py", line 94, in read
    obj.handle_error()
  File "/Users/buildbot/buildarea/3.10.pablogsal-macos-m1.macos-with-brew/build/Lib/test/test_ftplib.py", line 421, in handle_error
    raise Exception
Exception


Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.10.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncore.py", line 90, in read
    obj.handle_read_event()
  File "/Users/buildbot/buildarea/3.10.pablogsal-macos-m1.macos-with-brew/build/Lib/test/test_ftplib.py", line 384, in handle_read_event
    self._do_ssl_handshake()
  File "/Users/buildbot/buildarea/3.10.pablogsal-macos-m1.macos-with-brew/build/Lib/test/test_ftplib.py", line 345, in _do_ssl_handshake
    self.socket.do_handshake()
  File "/Users/buildbot/buildarea/3.10.pablogsal-macos-m1.macos-with-brew/build/Lib/ssl.py", line 1341, in do_handshake
    self._sslobj.do_handshake()
ssl.SSLZeroReturnError: TLS/SSL connection has been closed (EOF) (_ssl.c:997)


Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.10.pablogsal-macos-m1.macos-with-brew/build/Lib/multiprocessing/resource_tracker.py", line 209, in main
    cache[rtype].remove(name)
KeyError: '/psm_944ff87e'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ericsnowcurrently ericsnowcurrently ericsnowcurrently left review comments

@isidentical isidentical isidentical approved these changes

@iritkatriel iritkatriel Awaiting requested review from iritkatriel iritkatriel is a code owner

@lysnikolaou lysnikolaou Awaiting requested review from lysnikolaou lysnikolaou is a code owner

@gpshead gpshead Awaiting requested review from gpshead

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@pablogsal @miss-islington @bedevere-bot @gpshead @ericsnowcurrently @isidentical @the-knights-who-say-ni
0