From 93b08cab1c1934503c1a59763ec08ecd6206eba7 Mon Sep 17 00:00:00 2001 From: Saul Shanabrook Date: Thu, 15 Aug 2019 09:21:59 -0400 Subject: [PATCH] Make pinned extension filename windows compat --- jupyterlab/commands.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jupyterlab/commands.py b/jupyterlab/commands.py index 524fcbd57150..06d91e1e4bcb 100644 --- a/jupyterlab/commands.py +++ b/jupyterlab/commands.py @@ -38,6 +38,9 @@ DEV_DIR = osp.abspath(os.path.join(HERE, '..', 'dev_mode')) +# If we are pinning the package, rename it `pin@` +PIN_PREFIX = 'pin@' + class ProgressProcess(Process): def __init__(self, cmd, logger=None, cwd=None, kill_event=None, @@ -1214,8 +1217,8 @@ def _get_extensions_in_dir(self, dname, core_data): path = osp.abspath(target) filename = osp.basename(target) - if filename.startswith("pin:"): - alias = filename[len("pin:"):-len(".tgz")] + if filename.startswith(PIN_PREFIX): + alias = filename[len(PIN_PREFIX):-len(".tgz")] else: alias = None # homepage, repository are optional @@ -1479,10 +1482,9 @@ def _extract_package(self, source, tempdir, pin=None): info['path'] = target else: info['path'] = path - # If we are pinning the package, rename it `pin:`` if pin: old_path = info['path'] - new_path = pjoin(osp.dirname(old_path), 'pin:{}.tgz'.format(pin)) + new_path = pjoin(osp.dirname(old_path), '{}{}.tgz'.format(PIN_PREFIX, pin)) shutil.move(old_path, new_path) info['path'] = new_path