From: Kirill Podoprigora <kirill.bast9@mail.ru>
Date: Sat, 8 Jun 2024 20:45:57 +0000 (+0300)
Subject: gh-120268: Prohibit passing ``None`` to ``_pydatetime.date.fromtimestamp`` (#120269)
X-Git-Tag: v3.14.0a1~1552
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34f5ae69fe9ab0f5b23311d5c396d0cbb5902913;p=thirdparty%2FPython%2Fcpython.git

gh-120268: Prohibit passing ``None`` to ``_pydatetime.date.fromtimestamp`` (#120269)

This makes the pure Python implementation consistent with the C implementation.
---

diff --git a/Lib/_pydatetime.py b/Lib/_pydatetime.py
index b7d569cc4174..34ccb2da13d0 100644
--- 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 b80da5697ef8..28f75a803b4e 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -1336,6 +1336,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
index 000000000000..d48d43cd047f
--- /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.