From 1a577729e347714eb819fa3a3a00149406c24e5e Mon Sep 17 00:00:00 2001
From: AN Long <aisk@users.noreply.github.com>
Date: Fri, 20 Sep 2024 20:42:43 +0800
Subject: [PATCH] gh-111513: Improve datetime.fromtimestamp's error message
 (#124249)

---
 .../Library/2024-09-19-16-00-22.gh-issue-111513.6jHm02.rst    | 1 +
 Python/pytime.c                                               | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Library/2024-09-19-16-00-22.gh-issue-111513.6jHm02.rst

diff --git a/Misc/NEWS.d/next/Library/2024-09-19-16-00-22.gh-issue-111513.6jHm02.rst b/Misc/NEWS.d/next/Library/2024-09-19-16-00-22.gh-issue-111513.6jHm02.rst
new file mode 100644
index 00000000000..c6b85f9cd72
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-09-19-16-00-22.gh-issue-111513.6jHm02.rst
@@ -0,0 +1 @@
+Improve the error message that may be raised by :meth:`datetime.date.fromtimestamp`.
diff --git a/Python/pytime.c b/Python/pytime.c
index cd769707186..2b37cd991ef 100644
--- a/Python/pytime.c
+++ b/Python/pytime.c
@@ -387,6 +387,10 @@ pytime_object_to_denominator(PyObject *obj, time_t *sec, long *numerator,
         *sec = _PyLong_AsTime_t(obj);
         *numerator = 0;
         if (*sec == (time_t)-1 && PyErr_Occurred()) {
+            if (PyErr_ExceptionMatches(PyExc_TypeError)) {
+                PyErr_Format(PyExc_TypeError,
+                             "argument must be int or float, not %T", obj);
+            }
             return -1;
         }
         return 0;