https://github.com/python/cpython/commit/8e4ff5c7885abb04a66d079499335c4d46106aff
commit: 8e4ff5c7885abb04a66d079499335c4d46106aff
branch: main
author: Ronald Oussoren <[email protected]>
committer: ronaldoussoren <[email protected]>
date: 2024-01-01T21:31:43+01:00
summary:
gh-53502: Fixes for tests in gh-113363 (#113627)
* gh-53502: Fixes for tests in gh-113363
* Use 32-bit compatible date in
test_dump_naive_datetime_with_aware_datetime_option
* Saving non-aware datetimes will use the old behaviour regardless of the
aware_datimetime setting
files:
M Lib/plistlib.py
M Lib/test/test_plistlib.py
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 d41975f1b17184..010393a417b946 100644
--- a/Lib/test/test_plistlib.py
+++ b/Lib/test/test_plistlib.py
@@ -881,12 +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)
- self.assertEqual(parsed, expected)
+ self.assertEqual(parsed, dt)
class TestBinaryPlistlib(unittest.TestCase):
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
