[3.13] gh-120268: Prohibit passing ``None`` to ``_pydatetime.date.fromtimestamp`...

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

Co-authored-by: Kirill Podoprigora <kirill.bast9@mail.ru>

diff --git a/Lib/_pydatetime.py b/Lib/_pydatetime.py
index b7d569cc41740e0a36fa474f094d5c4d9b4036fd..34ccb2da13d0f31ac197e8d7b634b002456d4b20 100644 (file)
--- a/Lib/_pydatetime.py
+++ b/Lib/_pydatetime.py
@@ -966,6 +966,8 @@ class date:
     @classmethod
     def fromtimestamp(cls, t):
         "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)
         return cls(y, m, d)
 

diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index db6502b34711af35df2a402f65277f6f7098b9de..ddd8e02022f188d6d71bf9c66b8a639312d47518 100644 (file)
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -1355,6 +1355,11 @@ class TestDate(HarmlessMixedComparison, unittest.TestCase):
             self.assertRaises(OverflowError, self.theclass.fromtimestamp,
                               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):
         import time
 

diff --git a/Misc/NEWS.d/next/Library/2024-06-08-14-36-40.gh-issue-120268.MNpd1q.rst b/Misc/NEWS.d/next/Library/2024-06-08-14-36-40.gh-issue-120268.MNpd1q.rst
new file mode 100644 (file)
index 0000000..d48d43c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-06-08-14-36-40.gh-issue-120268.MNpd1q.rst
@@ -0,0 +1,2 @@
+Prohibit passing ``None`` to pure-Python :meth:`datetime.date.fromtimestamp`
+to achieve consistency with C-extension implementation.