mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-10 22:36:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-53502: Fix plistlib.dump() for naive datetime with aware_datetime option (GH-113645)

Browse source
This commit is contained in:
Serhiy Storchaka 2024-01-02 21:45:36 +02:00 • committed by GitHub
parent fff1e8a50b
commit 50b093f5c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/plistlib.py
View file

@ -155,7 +155,7 @@ def _date_from_string(s, aware_datetime):
def _date_to_string(d, 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) d = d.astimezone(datetime.UTC)
return '%04d-%02d-%02dT%02d:%02d:%02dZ' % ( return '%04d-%02d-%02dT%02d:%02d:%02dZ' % (
d.year, d.month, d.day, d.year, d.month, d.day,
@ -791,7 +791,7 @@ class _BinaryPlistWriter (object):
self._fp.write(struct.pack('>Bd', 0x23, value)) self._fp.write(struct.pack('>Bd', 0x23, value))
elif isinstance(value, datetime.datetime): elif isinstance(value, datetime.datetime):
if self._aware_datetime and value.tzinfo is not None: if self._aware_datetime:
dt = value.astimezone(datetime.UTC) dt = value.astimezone(datetime.UTC)
offset = dt - datetime.datetime(2001, 1, 1, tzinfo=datetime.UTC) offset = dt - datetime.datetime(2001, 1, 1, tzinfo=datetime.UTC)
f = offset.total_seconds() f = offset.total_seconds()

3
Lib/test/test_plistlib.py
View file

@ -885,7 +885,8 @@ class TestPlistlib(unittest.TestCase):
for fmt in ALL_FORMATS: for fmt in ALL_FORMATS:
s = plistlib.dumps(dt, fmt=fmt, aware_datetime=True) s = plistlib.dumps(dt, fmt=fmt, aware_datetime=True)
parsed = plistlib.loads(s, aware_datetime=False) 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): class TestBinaryPlistlib(unittest.TestCase):