iframe-proxy

chgnrdv · 2023-04-27T21:31:18Z

Issue: trace: line tracing output lacks newlines if source lines are not available #103956

check if call to `linecache.getline` returns non-empty string otherwise print only filename with lineno

chgnrdv · 2023-04-27T21:36:32Z

With this fix the output for frames with missing source files will look like this:

 --- modulename: example, funcname: <module>
example.py(2): import signal
 --- modulename: _bootstrap, funcname: _find_and_load
<frozen importlib._bootstrap>(1299)
<frozen importlib._bootstrap>(1300)
<frozen importlib._bootstrap>(1302)
 --- modulename: _bootstrap, funcname: __init__
<frozen importlib._bootstrap>(325)
<frozen importlib._bootstrap>(326)
 --- modulename: _bootstrap, funcname: __enter__
<frozen importlib._bootstrap>(329)
 --- modulename: _bootstrap, funcname: _get_module_lock
<frozen importlib._bootstrap>(344)
<frozen importlib._bootstrap>(345)
<frozen importlib._bootstrap>(346)
<frozen importlib._bootstrap>(347)
<frozen importlib._bootstrap>(348)
<frozen importlib._bootstrap>(349)
<frozen importlib._bootstrap>(351)
<frozen importlib._bootstrap>(352)
<frozen importlib._bootstrap>(355)
 --- modulename: _bootstrap, funcname: __init__
<frozen importlib._bootstrap>(165)
<frozen importlib._bootstrap>(166)
<frozen importlib._bootstrap>(169)
<frozen importlib._bootstrap>(173)
<frozen importlib._bootstrap>(184)
<frozen importlib._bootstrap>(198)
<frozen importlib._bootstrap>(357)
<frozen importlib._bootstrap>(368)
<frozen importlib._bootstrap>(370)
<frozen importlib._bootstrap>(372)
<frozen importlib._bootstrap>(330)
 --- modulename: _bootstrap, funcname: acquire
<frozen importlib._bootstrap>(222)
<frozen importlib._bootstrap>(223)
 --- modulename: _bootstrap, funcname: __init__
<frozen importlib._bootstrap>(71)
<frozen importlib._bootstrap>(72)
 --- modulename: _bootstrap, funcname: __enter__
<frozen importlib._bootstrap>(82)
<frozen importlib._bootstrap>(83)
<frozen importlib._bootstrap>(224)
<frozen importlib._bootstrap>(228)
<frozen importlib._bootstrap>(229)
<frozen importlib._bootstrap>(236)
<frozen importlib._bootstrap>(237)
<frozen importlib._bootstrap>(238)
<frozen importlib._bootstrap>(228)
<frozen importlib._bootstrap>(223)
 --- modulename: _bootstrap, funcname: __exit__
<frozen importlib._bootstrap>(87)
<frozen importlib._bootstrap>(1303)
<frozen importlib._bootstrap>(1304)
<frozen importlib._bootstrap>(1305)
 --- modulename: _bootstrap, funcname: _find_and_load_unlocked
<frozen importlib._bootstrap>(1250)
<frozen importlib._bootstrap>(1251)
<frozen importlib._bootstrap>(1252)
<frozen importlib._bootstrap>(1253)
<frozen importlib._bootstrap>(1267)
 --- modulename: _bootstrap, funcname: _find_spec
<frozen importlib._bootstrap>(1185)
<frozen importlib._bootstrap>(1186)
<frozen importlib._bootstrap>(1191)
<frozen importlib._bootstrap>(1197)
<frozen importlib._bootstrap>(1198)
<frozen importlib._bootstrap>(1199)
 --- modulename: _bootstrap, funcname: __enter__
<frozen importlib._bootstrap>(1157)
<frozen importlib._bootstrap>(1200)
<frozen importlib._bootstrap>(1201)
<frozen importlib._bootstrap>(1207)

serhiy-storchaka

Could you please add some tests?

…on into trace-fix-lacking-newlines

chgnrdv · 2024-02-10T23:04:19Z

It turned out that line tracing isn't tested at all. I will open a separate issue to handle it.

serhiy-storchaka

LGTM!

miss-islington-app · 2024-05-09T12:09:48Z

Thanks @chgnrdv for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

…ythonGH-103958) Print only filename with lineno if linecache.getline() returns an empty string. (cherry picked from commit 7c87ce7) Co-authored-by: Radislav Chugunov <52372310+chgnrdv@users.noreply.github.com>

bedevere-app · 2024-05-09T12:10:01Z

GH-118832 is a backport of this pull request to the 3.12 branch.

bedevere-app · 2024-05-09T12:10:08Z

GH-118833 is a backport of this pull request to the 3.11 branch.

miss-islington-app · 2024-05-09T12:25:08Z

Thanks @chgnrdv for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

…ythonGH-103958) Print only filename with lineno if linecache.getline() returns an empty string. (cherry picked from commit 7c87ce7) Co-authored-by: Radislav Chugunov <52372310+chgnrdv@users.noreply.github.com>

bedevere-app · 2024-05-09T12:25:21Z

GH-118834 is a backport of this pull request to the 3.13 branch.

serhiy-storchaka · 2024-05-09T12:28:34Z

…H-103958) (GH-118832) Print only filename with lineno if linecache.getline() returns an empty string. (cherry picked from commit 7c87ce7) Co-authored-by: Radislav Chugunov <52372310+chgnrdv@users.noreply.github.com>

…H-103958) (GH-118834) Print only filename with lineno if linecache.getline() returns an empty string. (cherry picked from commit 7c87ce7) Co-authored-by: Radislav Chugunov <52372310+chgnrdv@users.noreply.github.com>

…ythonGH-103958) Print only filename with lineno if linecache.getline() returns an empty string.

Fix Trace.localtrace_trace* output in case of missing source line

589f22f

check if call to `linecache.getline` returns non-empty string otherwise print only filename with lineno

bedevere-bot mentioned this pull request Apr 27, 2023

trace: line tracing output lacks newlines if source lines are not available #103956

Closed

bedevere-bot added the awaiting review label Apr 27, 2023

📜🤖 Added by blurb_it.

83bc542

serhiy-storchaka reviewed Feb 2, 2024

View reviewed changes

chgnrdv added 5 commits February 10, 2024 21:23

refactor

e840e5f

Merge branch 'main' into trace-fix-lacking-newlines

ea443aa

Merge branch 'main' into trace-fix-lacking-newlines

095a204

added test

f9fffa8

Merge branch 'trace-fix-lacking-newlines' of github.com:chgnrdv/cpyth…

7e452a8

…on into trace-fix-lacking-newlines

serhiy-storchaka approved these changes Feb 12, 2024

View reviewed changes

bedevere-app Bot added awaiting merge and removed awaiting review labels Feb 12, 2024

serhiy-storchaka enabled auto-merge (squash) February 12, 2024 11:13

serhiy-storchaka added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Feb 12, 2024

Merge branch 'main' into trace-fix-lacking-newlines

505f4e0

serhiy-storchaka merged commit 7c87ce7 into python:main May 9, 2024

bedevere-app Bot removed the awaiting merge label May 9, 2024

bedevere-app Bot removed the needs backport to 3.12 only security fixes label May 9, 2024

bedevere-app Bot removed the needs backport to 3.11 only security fixes label May 9, 2024

serhiy-storchaka added the needs backport to 3.13 bugs and security fixes label May 9, 2024

bedevere-app Bot removed the needs backport to 3.13 bugs and security fixes label May 9, 2024

SonicField pushed a commit to SonicField/cpython that referenced this pull request May 9, 2024

pythongh-103956: Fix trace output in case of missing source line (p…

e570920

…ythonGH-103958) Print only filename with lineno if linecache.getline() returns an empty string.

JelleZijlstra mentioned this pull request May 28, 2024

backport a9a74da 3.13 #119642

Closed

Sunbelt Computer Software

PL/B Language Development and Support

Navigation Menu

Uh oh!

Uh oh!

gh-103956: fix `trace` output in case of missing source line - #103958

gh-103956: fix `trace` output in case of missing source line#103958
serhiy-storchaka merged 8 commits into
python:mainfrom
chgnrdv:trace-fix-lacking-newlines

chgnrdv commented Apr 27, 2023 •

edited by bedevere-bot

Loading

Uh oh!

chgnrdv commented Apr 27, 2023

Uh oh!

serhiy-storchaka left a comment

Uh oh!

chgnrdv commented Feb 10, 2024

Uh oh!

serhiy-storchaka left a comment

Uh oh!

miss-islington-app Bot commented May 9, 2024

Uh oh!

bedevere-app Bot commented May 9, 2024

Uh oh!

bedevere-app Bot commented May 9, 2024

Uh oh!

miss-islington-app Bot commented May 9, 2024

Uh oh!

bedevere-app Bot commented May 9, 2024

Uh oh!

serhiy-storchaka commented May 9, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Sunbelt Computer Software

PL/B Language Development and Support

Uh oh!

Uh oh!

Conversation

chgnrdv commented Apr 27, 2023 • edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chgnrdv commented Apr 27, 2023

Uh oh!

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Uh oh!

chgnrdv commented Feb 10, 2024

Uh oh!

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Uh oh!

miss-islington-app Bot commented May 9, 2024

Uh oh!

bedevere-app Bot commented May 9, 2024

Uh oh!

bedevere-app Bot commented May 9, 2024

Uh oh!

miss-islington-app Bot commented May 9, 2024

Uh oh!

bedevere-app Bot commented May 9, 2024

Uh oh!

serhiy-storchaka commented May 9, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

chgnrdv commented Apr 27, 2023 •

edited by bedevere-bot

Loading