https://github.com/python/cpython/commit/50b093f5c7060c0b44c264808411346cee7becf0
commit: 50b093f5c7060c0b44c264808411346cee7becf0
branch: main
author: Serhiy Storchaka <storch...@gmail.com>
committer: serhiy-storchaka <storch...@gmail.com>
date: 2024-01-02T21:45:36+02:00
summary:
gh-53502: Fix plistlib.dump() for naive datetime with aware_datetime option
(GH-113645)
files:
M Lib/plistlib.py
M Lib/test/test_plistlib.py
diff --git a/Lib/plistlib.py b/Lib/plistlib.py
index 6eb70cedd7aec6..0fc1b5cbfa8c49 100644
--- a/Lib/plistlib.py
+++ b/Lib/plistlib.py
@@ -155,7 +155,7 @@ def _date_from_string(s, aware_datetime):
def _date_to_string(d, aware_datetime):
- if aware_datetime and d.tzinfo is not None:
+ if aware_datetime:
d = d.astimezone(datetime.UTC)
return '%04d-%02d-%02dT%02d:%02d:%02dZ' % (
d.year, d.month, d.day,
@@ -791,7 +791,7 @@ def _write_object(self, value):
self._fp.write(struct.pack('>Bd', 0x23, value))
elif isinstance(value, datetime.datetime):
- if self._aware_datetime and value.tzinfo is not None:
+ if self._aware_datetime:
dt = value.astimezone(datetime.UTC)
offset = dt - datetime.datetime(2001, 1, 1,
tzinfo=datetime.UTC)
f = offset.total_seconds()
diff --git a/Lib/test/test_plistlib.py b/Lib/test/test_plistlib.py
index 010393a417b946..1d2e14a30c4e13 100644
--- a/Lib/test/test_plistlib.py
+++ b/Lib/test/test_plistlib.py
@@ -885,7 +885,8 @@ def
test_dump_naive_datetime_with_aware_datetime_option(self):
for fmt in ALL_FORMATS:
s = plistlib.dumps(dt, fmt=fmt, aware_datetime=True)
parsed = plistlib.loads(s, aware_datetime=False)
- self.assertEqual(parsed, dt)
+ expected = dt.astimezone(datetime.UTC).replace(tzinfo=None)
+ self.assertEqual(parsed, expected)
class TestBinaryPlistlib(unittest.TestCase):
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
