From 542f4c3c18f6199d2236bbb491ecf93f30851333 Mon Sep 17 00:00:00 2001 From: "Mr. Outis" Date: Tue, 24 Dec 2019 00:40:24 -0600 Subject: [PATCH] summon: wrap chdir_and_syspath in a try/finally --- dvc/api.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dvc/api.py b/dvc/api.py index 23d017427..2cdafc0a2 100644 --- a/dvc/api.py +++ b/dvc/api.py @@ -111,8 +111,8 @@ def summon(name, fname=None, args=None, repo=None, rev=None): with open(summon_path, "r") as fobj: objects = ruamel.yaml.safe_load(fobj.read())["objects"] - obj = next(x for x in objects if x.get("name") == name) - _summon = obj.get("summon") + obj = next(x for x in objects if x["name"] == name) + _summon = obj["summon"] outs = [ _repo.find_out_by_relpath(dep) for dep in _summon.get("deps", ()) @@ -142,11 +142,14 @@ def _chdir_and_syspath(path): # * Import will pollute sys.modules # * Weird errors if there is a name clash within sys.modules old_dir = os.path.abspath(os.curdir) - os.chdir(path) - sys.path.insert(0, path) - yield - sys.path.pop(0) - os.chdir(old_dir) + + try: + os.chdir(path) + sys.path.insert(0, path) + yield + finally: + sys.path.pop(0) + os.chdir(old_dir) def _import_string(import_name, silent=False):