summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Util.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index 4f4ac2d..6a7e4a1 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -1553,14 +1553,12 @@ del __revision__
def to_bytes (s):
if isinstance (s, bytes) or bytes is str:
return s
- else:
- return bytes (s, 'utf-8')
+ return bytes (s, 'utf-8')
def to_str (s):
- if bytes is str:
+ if bytes is str or is_String(s):
return s
- else:
- return str (s, 'utf-8')
+ return str (s, 'utf-8')
# Local Variables:
# tab-width:4