From 005239ade76cdf08a6cd3a3b05995ae7509a539d Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sat, 9 Feb 2019 06:36:07 +0200 Subject: [PATCH] py2: cast env keys to bytes Signed-off-by: Ruslan Kuprieiev --- dvc/daemon.py | 2 +- dvc/utils/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dvc/daemon.py b/dvc/daemon.py index 4891680e5..85d196f10 100644 --- a/dvc/daemon.py +++ b/dvc/daemon.py @@ -79,7 +79,7 @@ def daemon(args): env = fix_env() file_path = os.path.abspath(inspect.stack()[0][1]) - env["PYTHONPATH"] = cast_bytes_py2( + env[cast_bytes_py2("PYTHONPATH")] = cast_bytes_py2( os.path.dirname(os.path.dirname(file_path)) ) diff --git a/dvc/utils/__init__.py b/dvc/utils/__init__.py index 88cf7dd54..bb1fa0321 100644 --- a/dvc/utils/__init__.py +++ b/dvc/utils/__init__.py @@ -196,7 +196,7 @@ def fix_env(env=None): lp_orig = env.get(lp_key + "_ORIG", None) if lp_orig is not None: # NOTE: py2 doesn't like unicode strings in environ - env[lp_key] = cast_bytes_py2(lp_orig) + env[cast_bytes_py2(lp_key)] = cast_bytes_py2(lp_orig) else: env.pop(lp_key, None)