Cache/retrieve extracted CIPD packages in local isolate cache

client/utils/fs.py

 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Wraps os, os.path and shutil functions to work around MAX_PATH on Windows."""
 
 import __builtin__
 import inspect
 import os
 import shutil
@@ skipping 103 matching lines @@
 
 else:
 
 
   def extend(path):
     """Convert the path back to utf-8.
 
     In some rare case, concatenating str and unicode may cause a
     UnicodeEncodeError because the default encoding is 'ascii'.
     """
-    assert os.path.isabs(path), path
-    assert isinstance(path, unicode), path
+    assert os.path.isabs(path), '%s must be absolute' % path

[M-A Ruel, 2017/05/08 13:13:14]

update lines 37-38 to be coherent
Use %r
what do you mean by "path or unicode" ?

[kjlubick, 2017/05/08 18:59:29]

Done.

I don't know what I meant.  

To quote Gary Larson "It was late and I was tired"

+    assert isinstance(path, unicode), '%s must be a path or unicode' % path
     return path.encode('utf-8')
 
 
   def trim(path):
     """Path mangling is not needed on POSIX."""
     assert os.path.isabs(path), path
     assert isinstance(path, str), path
     return path.decode('utf-8')
 
 
@@ skipping 69 matching lines @@
 for _fn in _os_fns:
   if hasattr(os, _fn):
     sys.modules[__name__].__dict__.setdefault(
         _fn, _get_lambda(getattr(os, _fn)))
 
 
 for _fn in _os_path_fns:
   if hasattr(os.path, _fn):
     sys.modules[__name__].__dict__.setdefault(
         _fn, _get_lambda(getattr(os.path, _fn)))