Skip to content
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

gh-126727: Fix locale.nl_langinfo(locale.ERA) #126730

Merged
merged 4 commits into from
Nov 21, 2024

Conversation

serhiy-storchaka
Copy link
Member

@serhiy-storchaka serhiy-storchaka commented Nov 12, 2024

It now returns multiple era description segments separated by semicolons. Previously it only returned the first segment on platforms with Glibc.


📚 Documentation preview 📚: https://cpython-previews--126730.org.readthedocs.build/

It now returns multiple era description segments separated by semicolons.
Previously it only returned the first segment on platforms with Glibc.
@serhiy-storchaka serhiy-storchaka merged commit 4803cd0 into python:main Nov 21, 2024
39 checks passed
@miss-islington-app
Copy link

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

@serhiy-storchaka serhiy-storchaka deleted the locale-nl_langinfo-era branch November 21, 2024 11:16
@miss-islington-app
Copy link

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 4803cd0244847f286641c85591fda08b513cea52 3.13

@miss-islington-app
Copy link

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 4803cd0244847f286641c85591fda08b513cea52 3.12

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Nov 21, 2024
…126730)

It now returns multiple era description segments separated by semicolons.
Previously it only returned the first segment on platforms with Glibc.
(cherry picked from commit 4803cd0)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Nov 21, 2024

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

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Nov 21, 2024
serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Nov 21, 2024
…126730)

It now returns multiple era description segments separated by semicolons.
Previously it only returned the first segment on platforms with Glibc.
(cherry picked from commit 4803cd0)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Nov 21, 2024

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

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Nov 21, 2024
@serhiy-storchaka serhiy-storchaka removed their assignment Nov 21, 2024
serhiy-storchaka added a commit that referenced this pull request Nov 21, 2024
…127098)

It now returns multiple era description segments separated by semicolons.
Previously it only returned the first segment on platforms with Glibc.
(cherry picked from commit 4803cd0)
serhiy-storchaka added a commit that referenced this pull request Nov 21, 2024
…127097)

It now returns multiple era description segments separated by semicolons.
Previously it only returned the first segment on platforms with Glibc.
(cherry picked from commit 4803cd0)
@bedevere-bot
Copy link

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

Hi! The buildbot aarch64 Android 3.x has failed when building commit 4803cd0.

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/1594/builds/635) and take a look at the build logs.
  4. Check if the failure is related to this commit (4803cd0) 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/1594/builds/635

Failed tests:

  • test_os

Failed subtests:

  • test_timerfd_ns_poll - test.test_os.TimerfdTests.test_timerfd_ns_poll
  • test_timerfd_poll - test.test_os.TimerfdTests.test_timerfd_poll

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

==

Click to see traceback logs
Traceback (most recent call last):
  File "/data/user/0/org.python.testbed/files/python/lib/python3.14/test/test_os.py", line 4391, in test_timerfd_poll
    self.check_timerfd_poll(False)
    ~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^
  File "/data/user/0/org.python.testbed/files/python/lib/python3.14/test/test_os.py", line 4379, in check_timerfd_poll
    self.assertEqual(self.read_count_signaled(fd), 1)
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 2 != 1


Traceback (most recent call last):
  File "/data/user/0/org.python.testbed/files/python/lib/python3.14/test/test_os.py", line 4394, in test_timerfd_ns_poll
    self.check_timerfd_poll(True)
    ~~~~~~~~~~~~~~~~~~~~~~~^^^^^^
  File "/data/user/0/org.python.testbed/files/python/lib/python3.14/test/test_os.py", line 4379, in check_timerfd_poll
    self.assertEqual(self.read_count_signaled(fd), 1)
    ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 2 != 1

@vstinner
Copy link
Member

test_timerfd_ns_poll - test.test_os.TimerfdTests.test_timerfd_ns_poll
test_timerfd_poll - test.test_os.TimerfdTests.test_timerfd_poll

It's unrelated to this change: that's issue gh-gh-124873. I proposed a fix: #127101

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.

3 participants