Skip to content

gh-53203: Fix strptime() for %c and %x formats on many locales #124946

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

Merged
serhiy-storchaka merged 18 commits into from
Oct 12, 2024
Merged

gh-53203: Fix strptime() for %c and %x formats on many locales #124946

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1305285
gh-53203: Fix strptime(..,'%c') on locales with short month names
serhiy-storchaka Oct 3, 2024
dafd06c
Do not run tests on default locale if it does not worl on all locales.
serhiy-storchaka Oct 4, 2024
b5bace6
Skip some tests on Emscripten.
serhiy-storchaka Oct 4, 2024
b0d1fb5
Skip some tests on WASI.
serhiy-storchaka Oct 7, 2024
e5be6fa
Add many comments and do not run tests on potentially broken locales.
serhiy-storchaka Oct 7, 2024
a674f29
Fx also for the Basque locale.
serhiy-storchaka Oct 7, 2024
34320d6
Fix for Arabic.
serhiy-storchaka Oct 7, 2024
684cb84
Merge branch 'main' into strptime-short-month-names
serhiy-storchaka Oct 8, 2024
8d8b01d
Update NEWS file.
serhiy-storchaka Oct 8, 2024
f9ff92a
Refactoring.
serhiy-storchaka Oct 8, 2024
71be06d
Update test comments.
serhiy-storchaka Oct 9, 2024
dcf8045
Polishing.
serhiy-storchaka Oct 9, 2024
39e16b5
Fix also Breton, Kashubian and Yoruba.
serhiy-storchaka Oct 9, 2024
391296b
Fix also Ge'ez.
serhiy-storchaka Oct 9, 2024
ef8c18e
Fix also Bodo.
serhiy-storchaka Oct 9, 2024
f64b374
Fix testing br_FR on old glibc.
serhiy-storchaka Oct 12, 2024
fdfbef6
Merge branch 'main' into strptime-short-month-names
serhiy-storchaka Oct 12, 2024
408bd34
Remove added by mistake test for id_ID.
serhiy-storchaka Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix testing br_FR on old glibc.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Oct 12, 2024
commit f64b374f4fb555c61ae777e83526710517e6f257
13 changes: 12 additions & 1 deletion Lib/test/test_strptime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import locale
import re
import os
import platform
import sys
from test import support
from test.support import warnings_helper
Expand All @@ -13,6 +14,13 @@

import _strptime

libc_ver = platform.libc_ver()
if libc_ver[0] == 'glibc':
glibc_ver = tuple(map(int, libc_ver[1].split('.')))
else:
glibc_ver = None


class getlang_Tests(unittest.TestCase):
"""Test _getlang"""
def test_basic(self):
Expand Down Expand Up @@ -482,9 +490,12 @@ def test_bad_timezone(self):
# for az_IR, fa_IR, lzh_TW, my_MM, or_IN, shn_MM.
@run_with_locales('LC_TIME', 'C', 'en_US', 'fr_FR', 'de_DE', 'ja_JP',
'he_IL', 'eu_ES', 'ar_AE', 'mfe_MU', 'yo_NG',
'csb_PL', 'br_FR', 'gez_ET', 'brx_IN')
'csb_PL', 'br_FR', 'gez_ET', 'brx_IN', 'id_ID')
def test_date_time_locale(self):
# Test %c directive
loc = locale.getlocale(locale.LC_TIME)[0]
if glibc_ver and glibc_ver < (2, 31) and loc == 'br_FR':
self.skipTest('%c in locale br_FR does not include time')
now = time.time()
self.roundtrip('%c', slice(0, 6), time.localtime(now))
# 1 hour 20 minutes 30 seconds ago
Expand Down