Repository navigation
GH-87235: Make sure "python /dev/fd/9 9</path/to/script.py" works on macOS - #99768
Merged
ronaldoussoren merged 3 commits intoNov 27, 2022
Merged
ronaldoussoren merged 3 commits into
ronaldoussoren merged 3 commits into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
…ks on macOS
On macOS all file descriptors for a particular file in /dev/fd
share the same file offset, that is ``open("/dev/fd/9", "r")`` behaves
more like ``dup(9)`` than a regular open.
This causes problems when a user tries to run "/dev/fd/9" as a script
because zipimport changes the file offset to try to read a zipfile
directory. Therefore change zipimport to reset the file offset after
trying to read the zipfile directory.
ronaldoussoren
requested review from
brettcannon,
encukou,
ericsnowcurrently,
ncoghlan and
warsaw
as code owners
November 25, 2022 09:18
ronaldoussoren
commented
Nov 25, 2022
Comment thread
Lib/zipimport.py
| # to not cause problems when some runs 'python3 /dev/fd/9 9<some_script' | ||
| start_offset = fp.tell() | ||
| try: | ||
| fp.seek(-END_CENTRAL_DIR_SIZE, 2) |
Copy link
Copy Markdown
Contributor
Author
There was a problem hiding this comment.
The PR looks messy here. I just indented the body of "with fp" one level deeper to add the code to reset the file offset, that is:
start_offset = fp.tell()
try:
<ORIGINAL CODE>
finally:
fp.seek(start_offset)
Sorry, something went wrong.
brettcannon
requested review from
serhiy-storchaka
and removed request for
brettcannon
November 25, 2022 19:07
serhiy-storchaka
approved these changes
Nov 26, 2022
serhiy-storchaka
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
It looks like a hack to me, but I do not know a better solution.
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
|
Thanks @ronaldoussoren for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11. |
Sorry, something went wrong.
Copy link
Copy Markdown
|
GH-99816 is a backport of this pull request to the 3.11 branch. |
Sorry, something went wrong.
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Nov 27, 2022
…ks on macOS (pythonGH-99768) On macOS all file descriptors for a particular file in /dev/fd share the same file offset, that is ``open("/dev/fd/9", "r")`` behaves more like ``dup(9)`` than a regular open. This causes problems when a user tries to run "/dev/fd/9" as a script because zipimport changes the file offset to try to read a zipfile directory. Therefore change zipimport to reset the file offset after trying to read the zipfile directory. (cherry picked from commit d08fb25) Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Nov 27, 2022
…ks on macOS (pythonGH-99768) On macOS all file descriptors for a particular file in /dev/fd share the same file offset, that is ``open("/dev/fd/9", "r")`` behaves more like ``dup(9)`` than a regular open. This causes problems when a user tries to run "/dev/fd/9" as a script because zipimport changes the file offset to try to read a zipfile directory. Therefore change zipimport to reset the file offset after trying to read the zipfile directory. (cherry picked from commit d08fb25) Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>
Copy link
Copy Markdown
|
GH-99817 is a backport of this pull request to the 3.10 branch. |
Sorry, something went wrong.
miss-islington
added a commit
that referenced
this pull request
Nov 27, 2022
…macOS (GH-99768) On macOS all file descriptors for a particular file in /dev/fd share the same file offset, that is ``open("/dev/fd/9", "r")`` behaves more like ``dup(9)`` than a regular open. This causes problems when a user tries to run "/dev/fd/9" as a script because zipimport changes the file offset to try to read a zipfile directory. Therefore change zipimport to reset the file offset after trying to read the zipfile directory. (cherry picked from commit d08fb25) Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>
ambv
added a commit
that referenced
this pull request
Mar 28, 2023
…rks on macOS (GH-99768) (#99817) On macOS all file descriptors for a particular file in /dev/fd share the same file offset, that is ``open("/dev/fd/9", "r")`` behaves more like ``dup(9)`` than a regular open. This causes problems when a user tries to run "/dev/fd/9" as a script because zipimport changes the file offset to try to read a zipfile directory. Therefore change zipimport to reset the file offset after trying to read the zipfile directory. (cherry picked from commit d08fb25) Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com> * Regen zipimport --------- Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com> Co-authored-by: Łukasz Langa <lukasz@langa.pl>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On macOS all file descriptors for a particular file in /dev/fd share the same file offset, that is open("/dev/fd/9", "r") behaves more like dup(9) than a regular open.
This causes problems when a user tries to run "/dev/fd/9" as a script because zipimport changes the file offset to try to read a zipfile directory. Therefore change zipimport to reset the file offset after trying to read the zipfile directory.