Use file system encoding for LUCI_CONTEXT env var value.

Otherwise run_isolated.py on Windows complains: https://chromium-swarm-dev.appspot.com/task?id=37768d5221b8ac10&show_raw=1 Also make sure write(...) restores original os.environ upon exit. [email protected] BUG=730878 Review-Url: https://codereview.chromium.org/2987523002
whesse · Jul 20, 2017 · 650536b · 650536b
1 parent 6f9c609
commit 650536b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/client/libs/luci_context/luci_context.py b/client/libs/luci_context/luci_context.py
@@ -18,6 +18,7 @@
 import json
 import logging
 import os
+import sys
 import tempfile
 import threading
 
@@ -97,6 +98,7 @@ def _initial_load():
 
   ctx_path = os.environ.get(_ENV_KEY)
   if ctx_path:
+    ctx_path = ctx_path.decode(sys.getfilesystemencoding())
     _LOGGER.debug('Loading LUCI_CONTEXT: %r', ctx_path)
     try:
       with open(ctx_path, 'r') as f:
@@ -231,13 +233,15 @@ def write(_tmpdir=None, **section_values):
         old_value = _CUR_CONTEXT
         old_envvar = os.environ.get(_ENV_KEY, None)
 
-        os.environ[_ENV_KEY] = name
+        os.environ[_ENV_KEY] = name.encode(sys.getfilesystemencoding())
         _CUR_CONTEXT = new_val
         yield
       finally:
         _CUR_CONTEXT = old_value
         if old_envvar is None:
           del os.environ[_ENV_KEY]
+        else:
+          os.environ[_ENV_KEY] = old_envvar
   finally:
     _WRITE_LOCK.release()