Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

gh-53502: Fixes for tests in gh-113363#113627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletionsLib/plistlib.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -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()
Expand Down
5 changes: 2 additions & 3 deletionsLib/test/test_plistlib.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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):
Expand Down

[8]ページ先頭

©2009-2025 Movatter.jp