mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

[3.13] gh-120268: Prohibit passing `None to _pydatetime.date.fromtimestamp` (GH-120269) (GH-120282)

Browse source 
This makes the pure Python implementation consistent with the C implementation.
(cherry picked from commit 34f5ae69fe)

Co-authored-by: Kirill Podoprigora <kirill.bast9@mail.ru>
This commit is contained in:
Miss Islington (bot) 2024-06-11 11:54:02 +02:00 • committed by GitHub
parent f386cc9620
commit 64a61ca13c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/_pydatetime.py
View file

@ -966,6 +966,8 @@ class date:
@classmethod @classmethod
def fromtimestamp(cls, t): def fromtimestamp(cls, t):
"Construct a date from a POSIX timestamp (like time.time())." "Construct a date from a POSIX timestamp (like time.time())."
if t is None:
raise TypeError("'NoneType' object cannot be interpreted as an integer")
y, m, d, hh, mm, ss, weekday, jday, dst = _time.localtime(t) y, m, d, hh, mm, ss, weekday, jday, dst = _time.localtime(t)
return cls(y, m, d) return cls(y, m, d)

5
Lib/test/datetimetester.py
View file

@ -1355,6 +1355,11 @@ class TestDate(HarmlessMixedComparison, unittest.TestCase):
self.assertRaises(OverflowError, self.theclass.fromtimestamp, self.assertRaises(OverflowError, self.theclass.fromtimestamp,
insane) insane)
def test_fromtimestamp_with_none_arg(self):
# See gh-120268 for more details
with self.assertRaises(TypeError):
self.theclass.fromtimestamp(None)
def test_today(self): def test_today(self):
import time import time

2
Misc/NEWS.d/next/Library/2024-06-08-14-36-40.gh-issue-120268.MNpd1q.rst Normal file
View file

@ -0,0 +1,2 @@
Prohibit passing ``None`` to pure-Python :meth:`datetime.date.fromtimestamp`
to achieve consistency with C-extension implementation.