Skip to content

bpo-37641 preserve relative file location in embeddable zip #14884

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
zooba merged 2 commits into from
Jul 25, 2019
Merged

bpo-37641 preserve relative file location in embeddable zip #14884

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07e31e1
bpo-37641 preserve relative file location in embeddable zip
mrginglymus Jul 21, 2019
a88abcd
bpo-37641 add comment referencing bpo issue
mrginglymus Jul 23, 2019
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
9 changes: 4 additions & 5 deletions PC/layout/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,18 +288,17 @@ def _compile_one_py(src, dest, name, optimize, checked=True):
return None


Comment thread
mrginglymus marked this conversation as resolved.
Outdated
def _py_temp_compile(src, ns, dest_dir=None, checked=True):
def _py_temp_compile(src, name, ns, dest_dir=None, checked=True):
if not ns.precompile or src not in PY_FILES or src.parent in DATA_DIRS:
return None

dest = (dest_dir or ns.temp) / (src.stem + ".py")
dest = (dest_dir or ns.temp) / (src.stem + ".pyc")
return _compile_one_py(
src, dest.with_suffix(".pyc"), dest, optimize=2, checked=checked
src, dest, name, optimize=2, checked=checked
)


def _write_to_zip(zf, dest, src, ns, checked=True):
pyc = _py_temp_compile(src, ns, checked=checked)
pyc = _py_temp_compile(src, dest, ns, checked=checked)
if pyc:
try:
zf.write(str(pyc), dest.with_suffix(".pyc"))
Expand Down