mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-29901: Improve support of path-like objects in zipapp. (#815)

Browse source 
Now general path-like objects are supported, not just pathlib.Path.
This commit is contained in:
Serhiy Storchaka 2017-03-25 13:05:23 +02:00 • committed by GitHub
parent 3c749fc867
commit 4aec9a8be2
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/zipapp.py
View file

@ -36,9 +36,7 @@ class ZipAppError(ValueError):
@contextlib.contextmanager
def _maybe_open(archive, mode):
if isinstance(archive, pathlib.Path):
archive = str(archive)
if isinstance(archive, str):
if isinstance(archive, (str, os.PathLike)):
with open(archive, mode) as f:
yield f
else:
@ -135,10 +133,9 @@ def create_archive(source, target=None, interpreter=None, main=None):
with _maybe_open(target, 'wb') as fd:
_write_file_prefix(fd, interpreter)
with zipfile.ZipFile(fd, 'w') as z:
root = pathlib.Path(source)
for child in root.rglob('*'):
arcname = str(child.relative_to(root))
z.write(str(child), arcname)
for child in source.rglob('*'):
arcname = child.relative_to(source).as_posix()
z.write(child, arcname)
if main_py:
z.writestr('__main__.py', main_py.encode('utf-8'))