From 6d6263095596ec959f79d130d24fa2e21f8b8209 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Mon, 1 Jan 2024 20:32:55 +0100 Subject: [PATCH 1/2] gh-53502: Fixes for tests in gh-113363 1. Use 32-bit compatible date in test_dump_naive_datetime_with_aware_datetime_option 2. test_dump_naive_datetime_with_aware_datetime_option: Writing non-aware datetimes with aware_datetime==True leads to the time being off by twice the timezone offset from UTC --- Lib/test/test_plistlib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_plistlib.py b/Lib/test/test_plistlib.py index d41975f1b17184..3d2ebebea8bef1 100644 --- a/Lib/test/test_plistlib.py +++ b/Lib/test/test_plistlib.py @@ -881,11 +881,11 @@ def test_dump_naive_datetime_with_aware_datetime_option(self): # Save a naive datetime with aware_datetime set to true. This will lead # to having different time as compared to the current machine's # timezone, which is UTC. - dt = datetime.datetime(2345, 6, 7, 8, tzinfo=None) + dt = datetime.datetime(2003, 6, 7, 8, tzinfo=None) for fmt in ALL_FORMATS: s = plistlib.dumps(dt, fmt=fmt, aware_datetime=True) parsed = plistlib.loads(s, aware_datetime=False) - expected = dt + datetime.timedelta(seconds=time.timezone) + expected = dt + 2 * datetime.timedelta(seconds=time.timezone) self.assertEqual(parsed, expected) From f9b6c0a3bedd9d440bb1212d3127e5817ec6e98a Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Mon, 1 Jan 2024 20:53:10 +0100 Subject: [PATCH 2/2] Saving non-aware datetimes will use the old behaviour regardless of the aware_datimetime setting --- Lib/plistlib.py | 4 ++-- Lib/test/test_plistlib.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Lib/plistlib.py b/Lib/plistlib.py index 0fc1b5cbfa8c49..6eb70cedd7aec6 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: + if aware_datetime and d.tzinfo is not None: 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: + if self._aware_datetime and value.tzinfo is not None: 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 3d2ebebea8bef1..010393a417b946 100644 --- a/Lib/test/test_plistlib.py +++ b/Lib/test/test_plistlib.py @@ -885,8 +885,7 @@ 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) - expected = dt + 2 * datetime.timedelta(seconds=time.timezone) - self.assertEqual(parsed, expected) + self.assertEqual(parsed, dt) class TestBinaryPlistlib(unittest.TestCase):