Skip to content

Feature/gh76 ampm fixes #77

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
smith153 merged 2 commits into from
Aug 26, 2025
Merged

Feature/gh76 ampm fixes #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d432f3c
Test fixes for locales without am/pm
smith153 Aug 23, 2025
59a9f9c
Add warnings for some parse failures
smith153 Aug 23, 2025
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
13 changes: 6 additions & 7 deletions Piece.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,16 +509,15 @@ my $strftime_trans_map = {
'k' => sub {
my ( $format, $time ) = @_;
my $hr = sprintf( "%2d", $time->[c_hour] );
$format =~ s/%k/$hr/ if $IS_WIN32;
$format =~ s/%k/$hr/;
return $format;
},
'l' => sub {
my ( $format, $time ) = @_;
if ($IS_WIN32) {
my $hr = $time->[c_hour] > 12 ? $time->[c_hour] - 12 : $time->[c_hour];
$hr = sprintf( "%2d", $hr );
$format =~ s/%l/$hr/ if $IS_WIN32;
}
my $hr = $time->[c_hour] > 12 ? $time->[c_hour] - 12 : $time->[c_hour];
$hr = 12 unless $hr;
$hr = sprintf( "%2d", $hr );
$format =~ s/%l/$hr/;
return $format;
},
'P' => sub {
Expand Down Expand Up @@ -854,7 +853,7 @@ my $_format_cache = {};
#accordance with the logic from the translation map subroutines
sub _translate_format {
my ( $format, $trans_map, $time ) = @_;
my $bad_flags = $IS_WIN32 ? qr/%([eklsVzZ])/ : qr/%([szZ])/;
my $bad_flags = $IS_WIN32 ? qr/%([eklsVzZ])/ : qr/%([klszZ])/;
my $can_cache = ($format !~ $bad_flags) ? 1 : 0;

if ( $can_cache && exists $_format_cache->{$format} ){
Expand Down
25 changes: 20 additions & 5 deletions Piece.xs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,10 @@ _strptime(pTHX_ const char *buf, const char *fmt, struct tm *tm, int *got_GMT)
if (isspace((unsigned char)c))
while (*buf != 0 && isspace((unsigned char)*buf))
buf++;
else if (c != *buf++)
else if (c != *buf++) {
warn("Time string mismatches format string");
return 0;
}
continue;
}

Expand Down Expand Up @@ -437,7 +439,12 @@ label:
break;

case 'r':
buf = _strptime(aTHX_ buf, "%I:%M:%S %p", tm, got_GMT);
if (Locale->AM && strlen(Locale->AM) > 0 &&
Locale->PM && strlen(Locale->PM) > 0) {
buf = _strptime(aTHX_ buf, "%I:%M:%S %p", tm, got_GMT);
} else {
buf = _strptime(aTHX_ buf, "%H:%M:%S", tm, got_GMT);
}
if (buf == 0)
return 0;
break;
Expand Down Expand Up @@ -539,8 +546,10 @@ label:
if (c == 'H' || c == 'k') {
if (i > 23)
return 0;
} else if (i > 12)
} else if (i > 12) {
warn("Hour cannot be >12 with %%I or %%l");
return 0;
}

tm->tm_hour = i;

Expand All @@ -558,8 +567,11 @@ label:
len = strlen(Locale->am);
if (strncasecmp(buf, Locale->am, len) == 0 ||
strncasecmp(buf, Locale->AM, len) == 0) {
if (tm->tm_hour > 12)
if (tm->tm_hour > 12) {
warn("Hour cannot be >12 with %%p");
return 0;
}

if (tm->tm_hour == 12)
tm->tm_hour = 0;
buf += len;
Expand All @@ -569,14 +581,17 @@ label:
len = strlen(Locale->pm);
if (strncasecmp(buf, Locale->pm, len) == 0 ||
strncasecmp(buf, Locale->PM, len) == 0) {
if (tm->tm_hour > 12)
if (tm->tm_hour > 12) {
warn("Hour cannot be >12 with %%p");
return 0;
}
if (tm->tm_hour != 12)
tm->tm_hour += 12;
buf += len;
break;
}

warn("Failed parsing %%p");
return 0;

case 'A':
Expand Down
2 changes: 1 addition & 1 deletion t/02core.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if (defined &Win32::GetCurrentProcessId
}
SKIP: {
skip "can't register TZ changes in a pseudo-fork", 2 if $is_pseudo_fork;
local $ENV{TZ} = "EST5EDT";
local $ENV{TZ} = "EST5EDT4,M3.2.0/2,M11.1.0/2";
Time::Piece::_tzset(); # register the environment change
my $lt = localtime(1735880528); #2025-01-03T05:02:08
cmp_ok(scalar($lt->tzoffset), 'eq', '-18000');
Expand Down
6 changes: 4 additions & 2 deletions t/02core_dst.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use Test::More;
# Skip if doing a regular install
# Avoids mystery DST bugs [rt 128240], [GH40]
plan skip_all => "DST tests not required for installation"
unless ( $ENV{AUTOMATED_TESTING} );
unless ( $ENV{AUTOMATED_TESTING} || $ENV{NONINTERACTIVE_TESTING} || $ENV{PERL_BATCH} );

my $is_win32 = ($^O =~ /Win32/);
my $is_qnx = ($^O eq 'qnx');
Expand Down Expand Up @@ -118,6 +118,8 @@ ok(not $t->is_leap_year); # should test more with different dates

cmp_ok($t->month_last_day, '==', 31); # test more

cmp_ok(gmtime(1755648001)->strftime("%I %k %H %l"), 'eq', "12 0 00 12"); # 8/20/25 0:0:1 These should be 12 or 0


SKIP: {
skip "Extra tests for Linux, BSD only.", 9 unless $is_linux or $is_mac or $is_bsd;
Expand All @@ -138,4 +140,4 @@ SKIP: {
is ($lt->strftime("%s"), 1357733231, 'Epoch output is the same with EST');
}

done_testing(59);
done_testing(60);
2 changes: 1 addition & 1 deletion t/06large.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use Time::Seconds;
my $is_win32 = ( $^O =~ /Win32/ );

plan skip_all => "Large time tests not required for installation"
unless ( $ENV{AUTOMATED_TESTING} );
unless ( $ENV{AUTOMATED_TESTING} || $ENV{NONINTERACTIVE_TESTING} || $ENV{PERL_BATCH} );

my $t = gmtime;

Expand Down
30 changes: 20 additions & 10 deletions t/09locales.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use Time::Piece;
# Skip if doing a regular install
# These are mostly for reverse parsing tests, not required for installation
plan skip_all => "Reverse parsing not required for installation"
unless ( $ENV{AUTOMATED_TESTING} );
unless ( $ENV{AUTOMATED_TESTING} || $ENV{NONINTERACTIVE_TESTING} || $ENV{PERL_BATCH} );

my $t = gmtime(1373371631); # 2013-07-09T12:07:11

Expand Down Expand Up @@ -56,15 +56,12 @@ my @dates = (
'%A, %e %B %Y at %H:%M:%S',
'%a, %e %b %Y at %r',
'%s',
'%c',
'%F %T',
'%D %r',

#TODO
# '%u %U %Y %T', #%U,W,V currently skipped inside strptime
# '%w %W %y %T',
'%A, %e %B %Y at %I:%M:%S %P', #%I and %p can be locale dependant
'%x %X', #hard coded to American localization
);

for my $time (
Expand All @@ -76,8 +73,17 @@ for my $time (
my $t = gmtime($time);

for my $strp_format (@dates) {

my $t_str = $t->strftime($strp_format);
my $parsed = $t->strptime( $t_str, $strp_format );
my $parsed;

eval { $parsed = $t->strptime( $t_str, $strp_format ); };

if ($@) {
warn("strptime failed with time $t_str and format $strp_format");
warn($@);
next;
}

check_parsed( $t, $parsed, $t_str, $strp_format );
}
Expand All @@ -95,14 +101,18 @@ for my $time (

my $t_str = $t->strftime($strp_format);
my $parsed;
SKIP: {
eval { $parsed = $t->strptime( $t_str, $strp_format ); };
skip "localtime strptime parse failed", 3 if $@;
check_parsed( $t, $parsed, $t_str, $strp_format );

eval { $parsed = $t->strptime( $t_str, $strp_format ); };

if ($@) {
warn("strptime failed with time $t_str and format $strp_format");
warn($@);
next;
}
check_parsed( $t, $parsed, $t_str, $strp_format );

}

}

done_testing(190);
done_testing(136);
49 changes: 30 additions & 19 deletions t/11strptime_defaults.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w

use Test::More tests => 128;
use Test::More tests => 129;
my $is_linux = ($^O =~ /linux/);

BEGIN { use_ok('Time::Piece'); }

Expand Down Expand Up @@ -297,24 +298,6 @@ my @known_localtime = localtime(1753440879);
is( $tp->sec, $tp_defaults->sec, "Shorthand: Second taken from object" );
}

# Test shorthand syntax - format defaults to $DATE_FORMAT
{
my $tp_defaults = localtime(1753440879);

# Using default format "%a, %d %b %Y %H:%M:%S %Z"
my $input_string = $tp_defaults->strftime();

# Replace specific parts to test parsing
$input_string =~ s/Jul/Mar/;
$input_string =~ s/25/15/;

my $tp = Time::Piece->strptime( $input_string, $tp_defaults );

is( $tp->mday, 15, "Shorthand no format: Day is correctly parsed" );
is( $tp->mon, 3, "Shorthand no format: Month is correctly parsed" );
is( $tp->year, 2025, "Shorthand no format: Year taken from defaults" );
}

# Test shorthand syntax - c_islocal copying
{
my $tp1 =
Expand Down Expand Up @@ -462,3 +445,31 @@ my @known_localtime = localtime(1753440879);
"No format, error: Correct error message"
);
}

# Test shorthand syntax - format defaults to $DATE_FORMAT
SKIP: {
skip "Default format tests for Linux only.", 4
unless $is_linux
&& ( $ENV{AUTOMATED_TESTING}
|| $ENV{NONINTERACTIVE_TESTING}
|| $ENV{PERL_BATCH} );

Time::Piece->use_locale();

my $tp_defaults = localtime(1753440879);

# Using default format "%a, %d %b %Y %H:%M:%S %Z"
my $input_string = $tp_defaults->strftime();

# Replace specific parts to test parsing
$input_string =~ s/25/15/;

my $tp = Time::Piece->strptime( $input_string, $tp_defaults );

is( $tp->mday, 15, "Shorthand no format: Day is correctly parsed" );
is( $tp->mon, 7, "Shorthand no format: Month is correctly parsed" );
is( $tp->year, 2025, "Shorthand no format: Year taken from defaults" );
is( $tp->[Time::Piece::c_islocal],
1, "Shorthand no format, object copied local" );
}

Loading