Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
b55de367
Commit
b55de367
authored
Nov 17, 2013
by
Victor Stinner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #19634: time.strftime("%y") now raises a ValueError on AIX when given a
year before 1900.
parent
7548040d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
9 deletions
+24
-9
Lib/test/test_strftime.py
Lib/test/test_strftime.py
+7
-9
Misc/NEWS
Misc/NEWS
+3
-0
Modules/timemodule.c
Modules/timemodule.c
+14
-0
No files found.
Lib/test/test_strftime.py
View file @
b55de367
...
...
@@ -182,15 +182,13 @@ class Y1900Tests(unittest.TestCase):
a date before 1900 is passed with a format string containing "%y"
"""
@
unittest
.
skipUnless
(
sys
.
platform
==
"win32"
,
"Only applies to Windows"
)
def
test_y_before_1900_win
(
self
):
with
self
.
assertRaises
(
ValueError
):
time
.
strftime
(
"%y"
,
(
1899
,
1
,
1
,
0
,
0
,
0
,
0
,
0
,
0
))
@
unittest
.
skipIf
(
sys
.
platform
==
"win32"
,
"Doesn't apply on Windows"
)
def
test_y_before_1900_nonwin
(
self
):
self
.
assertEqual
(
time
.
strftime
(
"%y"
,
(
1899
,
1
,
1
,
0
,
0
,
0
,
0
,
0
,
0
)),
"99"
)
def
test_y_before_1900
(
self
):
t
=
(
1899
,
1
,
1
,
0
,
0
,
0
,
0
,
0
,
0
)
if
sys
.
platform
==
"win32"
or
sys
.
platform
.
startswith
(
"aix"
):
with
self
.
assertRaises
(
ValueError
):
time
.
strftime
(
"%y"
,
t
)
else
:
self
.
assertEqual
(
time
.
strftime
(
"%y"
,
t
),
"99"
)
def
test_y_1900
(
self
):
self
.
assertEqual
(
...
...
Misc/NEWS
View file @
b55de367
...
...
@@ -50,6 +50,9 @@ Core and Builtins
Library
-------
-
Issue
#
19634
:
time
.
strftime
(
"%y"
)
now
raises
a
ValueError
on
AIX
when
given
a
year
before
1900.
-
Fix
test
.
support
.
bind_port
()
to
not
cause
an
error
when
Python
was
compiled
on
a
system
with
SO_REUSEPORT
defined
in
the
headers
but
run
on
a
system
with
an
OS
kernel
that
does
not
support
that
reasonably
new
socket
option
.
...
...
Modules/timemodule.c
View file @
b55de367
...
...
@@ -650,6 +650,20 @@ time_strftime(PyObject *self, PyObject *args)
return
NULL
;
}
}
#elif defined(_AIX)
for
(
outbuf
=
wcschr
(
fmt
,
'%'
);
outbuf
!=
NULL
;
outbuf
=
wcschr
(
outbuf
+
2
,
'%'
))
{
/* Issue #19634: On AIX, wcsftime("y", (1899, 1, 1, 0, 0, 0, 0, 0, 0))
returns "0/" instead of "99" */
if
(
outbuf
[
1
]
==
L'y'
&&
buf
.
tm_year
<
0
)
{
PyErr_SetString
(
PyExc_ValueError
,
"format %y requires year >= 1900 on AIX"
);
Py_DECREF
(
format
);
return
NULL
;
}
}
#endif
fmtlen
=
time_strlen
(
fmt
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment