diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Action.py | 7 | ||||
| -rw-r--r-- | src/engine/SCons/Util.py | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py index 7a97dae..66757a4 100644 --- a/src/engine/SCons/Action.py +++ b/src/engine/SCons/Action.py @@ -434,12 +434,7 @@ class ActionBase(object): def get_contents(self, target, source, env): result = [ self.get_presig(target, source, env) ] - def clean (u): - if isinstance (u, bytes): - return u - elif isinstance (u, str): - return bytes (u, 'utf-8') - result = [ clean(r) for r in result ] + result = [ SCons.Util.to_bytes(r) for r in result ] # This should never happen, as the Action() factory should wrap # the varlist, but just in case an action is created directly, # we duplicate this check here. diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py index 00fde6c..0c4daff 100644 --- a/src/engine/SCons/Util.py +++ b/src/engine/SCons/Util.py @@ -1486,7 +1486,7 @@ class NullSeq(Null): del __revision__ def to_bytes (s): - if bytes is str: + if isinstance (s, bytes) or bytes is str: return s else: return bytes (s, 'utf-8') |