pythongh-120268: Prohibit passing None to ``_pydatetime.date.from…

…timestamp`` (pythonGH-120269) This makes the pure Python implementation consistent with the C implementation. (cherry picked from commit 34f5ae6) Co-authored-by: Kirill Podoprigora <[email protected]>
miss-islington · Jun 8, 2024 · d3c3144 · d3c3144
1 parent b134f47
commit d3c3144
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/Lib/_pydatetime.py b/Lib/_pydatetime.py
@@ -970,6 +970,8 @@ def __new__(cls, year, month=None, day=None):
     @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
@@ -1331,6 +1331,11 @@ def test_insane_fromtimestamp(self):
             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
@@ -0,0 +1,2 @@
+Prohibit passing ``None`` to pure-Python :meth:`datetime.date.fromtimestamp`
+to achieve consistency with C-extension implementation.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Prohibit passing ``None`` to pure-Python :meth:`datetime.date.fromtimestamp`
		to achieve consistency with C-extension implementation.