Skip to content

gh-91279: ZipFile.writestr now respect SOURCE_DATE_EPOCH #124435

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 20, 2025
Merged

gh-91279: ZipFile.writestr now respect SOURCE_DATE_EPOCH #124435

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
693e66f
finish
Wulian233 Dec 30, 2024
d07b4ad
Update __init__.py
Wulian233 Dec 30, 2024
54a7116
using time.localtime
Wulian233 Jan 1, 2025
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
Prev Previous commit
Next Next commit
Update __init__.py
  • Loading branch information
@Wulian233
Wulian233 authored Dec 30, 2024
commit d07b4adc28e1904af79fa1d24da10ef3171ef756
6 changes: 3 additions & 3 deletions Lib/zipfile/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,9 +615,9 @@ def _for_archive(self, archive: ZipFile) -> Self:
Return self.
"""
# gh-91279: Set the SOURCE_DATE_EPOCH to a specific timestamp
self.epoch = os.environ.get('SOURCE_DATE_EPOCH')
self.get_time = int(self.epoch) if self.epoch else time.time()
self.date_time = time.gmtime(self.get_time)[:6]
epoch = os.environ.get('SOURCE_DATE_EPOCH')
get_time = int(epoch) if epoch else time.time()
self.date_time = time.gmtime(get_time)[:6]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little uneasy that time.localtime() is now replaced by time.gmtime(). That means that the value will change depending on the local time zone of the machine running the code, which may not be adequately exercised in the code. Are there existing tests that validate that gmtime is the correct usage here?

Copy link
Contributor Author

@Wulian233 Wulian233 Jan 1, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked the documentation. Should time.gmtime return UTC time and not change with time zones? time.localtime says "Like gmtime() but converts to local time"

https://docs.python.org/3.14/library/time.html#time.gmtime

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I mean is that this change alters the behavior for all cases. The issue doesn't make mention of gmtime and only mentions localtime in relation to the current implementation. What's the motivation for changing it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I see that I was mistaken. To implement this PR I originally thought it was necessary to change it to gmtime, but in fact, this modification should not have been made😥


self.compress_type = archive.compression
self.compress_level = archive.compresslevel
Expand Down
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy