Skip to content

gh-135496: Fix f string exclamation mark error typo #135495

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.

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

Merged
merged 4 commits into from
Jun 14, 2025

Conversation

MeGaGiGaGon
Copy link
Contributor

@MeGaGiGaGon MeGaGiGaGon commented Jun 14, 2025

Typo fix, the error has "exclamanation" instead of "exclamation"

@python-cla-bot
Copy link

python-cla-bot bot commented Jun 14, 2025

All commit authors signed the Contributor License Agreement.

CLA signed

@bedevere-app
Copy link

bedevere-app bot commented Jun 14, 2025

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

Copy link
Member

@ZeroIntensity ZeroIntensity left a comment

Choose a reason for hiding this comment

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

The core change looks good to me, but please make an issue and blurb entry for posterity.

@MeGaGiGaGon MeGaGiGaGon changed the title Fix f string exclamation mark error typo gh-135496: Fix f string exclamation mark error typo Jun 14, 2025
@ZeroIntensity ZeroIntensity added needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Jun 14, 2025
@skirpichev skirpichev requested a review from ZeroIntensity June 14, 2025 02:39
…e-135496.ER0Me3.rst

Co-authored-by: Sergey B Kirpichev <skirpichev@gmail.com>
@terryjreedy terryjreedy merged commit c2bb3f9 into python:main Jun 14, 2025
39 checks passed
@miss-islington-app
Copy link

Thanks @MeGaGiGaGon for the PR, and @terryjreedy for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 14, 2025
…35495)

(cherry picked from commit c2bb3f9)

Co-authored-by: GiGaGon <107241144+MeGaGiGaGon@users.noreply.github.com>
@miss-islington-app
Copy link

Sorry, @MeGaGiGaGon and @terryjreedy, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker c2bb3f9843bc4763d6d41e883dbe9525f5155a4a 3.13

@bedevere-app
Copy link

bedevere-app bot commented Jun 14, 2025

GH-135499 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Jun 14, 2025
@terryjreedy terryjreedy removed the needs backport to 3.13 bugs and security fixes label Jun 14, 2025
terryjreedy pushed a commit that referenced this pull request Jun 14, 2025
#135499)

gh-135496: Fix f string exclamation mark error typo (GH-135495)
(cherry picked from commit c2bb3f9)

Co-authored-by: GiGaGon <107241144+MeGaGiGaGon@users.noreply.github.com>
@terryjreedy
Copy link
Member

terryjreedy commented Jun 14, 2025

@MeGaGiGaGon Can you prepare a 3.13 backport? The comment on the make-a-PR page details how to adjust the title and message. Make sure to prepare using 3.13 branch and compare to 3.13 on the make-a-PR page. If you do not understand, I can fix but wrong title will be a test error.

Both lines to be corrected are 10 lines earlier, but this is not the issue. The merge conflict is that on the crossinterp.c lines, what is 'c-string' now and in 3.14 is 'f- string' in 3.13. So make same 2 changes on otherwise same 2 lines. I consider the blurb for a typo to be optional.

@bedevere-bot
Copy link

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

Hi! The buildbot s390x Fedora Stable Refleaks 3.14 (tier-3) has failed when building commit 7499bcd.

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/#/builders/1776/builds/167) and take a look at the build logs.
  4. Check if the failure is related to this commit (7499bcd) 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/#/builders/1776/builds/167

Failed tests:

  • test_os

Failed subtests:

  • test_timerfd_ns_select - test.test_os.TimerfdTests.test_timerfd_ns_select

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

==

Click to see traceback logs
Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.14.cstratak-fedora-stable-s390x.refleak/build/Lib/test/test_os.py", line 4617, in test_timerfd_ns_select
    self.assertEqual(self.read_count_signaled(fd), 1)
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 2 != 1

@bedevere-app
Copy link

bedevere-app bot commented Jun 14, 2025

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants