From e464cb44fa3af5ad3ecd83f9c045b16981d01bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Egelund-M=C3=BCller?= <b@egelund-muller.com>
Date: Tue, 16 Nov 2021 09:49:47 +0100
Subject: Nicer error when packing a datetime without tzinfo (#466)

---
 msgpack/_packer.pyx    |  2 ++
 msgpack/fallback.py    |  4 ++++
 test/test_timestamp.py | 16 ++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/msgpack/_packer.pyx b/msgpack/_packer.pyx
index e6cd2c7..396da0c 100644
--- a/msgpack/_packer.pyx
+++ b/msgpack/_packer.pyx
@@ -285,6 +285,8 @@ cdef class Packer(object):
                 o = self._default(o)
                 default_used = 1
                 continue
+            elif self.datetime and PyDateTime_CheckExact(o):
+                PyErr_Format(ValueError, b"can not serialize '%.200s' object where tzinfo=None", Py_TYPE(o).tp_name)
             else:
                 PyErr_Format(TypeError, b"can not serialize '%.200s' object", Py_TYPE(o).tp_name)
             return ret
diff --git a/msgpack/fallback.py b/msgpack/fallback.py
index 4540875..b27acb2 100644
--- a/msgpack/fallback.py
+++ b/msgpack/fallback.py
@@ -874,6 +874,10 @@ class Packer(object):
                 obj = self._default(obj)
                 default_used = 1
                 continue
+
+            if self._datetime and check(obj, _DateTime):
+                raise ValueError("Cannot serialize %r where tzinfo=None" % (obj,))
+
             raise TypeError("Cannot serialize %r" % (obj,))
 
     def pack(self, obj):
diff --git a/test/test_timestamp.py b/test/test_timestamp.py
index 6a29be7..4e26489 100644
--- a/test/test_timestamp.py
+++ b/test/test_timestamp.py
@@ -140,3 +140,19 @@ def test_issue451():
 
     unpacked = msgpack.unpackb(packed, timestamp=3)
     assert dt == unpacked
+
+
+@pytest.mark.skipif(sys.version_info[0] == 2, reason="datetime support is PY3+ only")
+def test_pack_datetime_without_tzinfo():
+    dt = datetime.datetime(1970, 1, 1, 0, 0, 42, 14)
+    with pytest.raises(ValueError, match="where tzinfo=None"):
+        packed = msgpack.packb(dt, datetime=True)
+
+    dt = datetime.datetime(1970, 1, 1, 0, 0, 42, 14)
+    packed = msgpack.packb(dt, datetime=True, default=lambda x: None)
+    assert packed == msgpack.packb(None)
+
+    dt = datetime.datetime(1970, 1, 1, 0, 0, 42, 14, tzinfo=_utc)
+    packed = msgpack.packb(dt, datetime=True)
+    unpacked = msgpack.unpackb(packed, timestamp=3)
+    assert unpacked == dt
-- 
cgit v1.2.1