summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranatoly techtonik <techtonik@gmail.com>2015-05-18 16:56:04 +0300
committeranatoly techtonik <techtonik@gmail.com>2015-05-18 16:56:04 +0300
commitf65025d120e891b9e56e59799f05cf92cfb757b6 (patch)
tree4f1173f16765e4e8772e3d099b937cb855f699ff
parentd03034908e89d1bf25243fc915858bbd6b637635 (diff)
downloadscons-f65025d120e891b9e56e59799f05cf92cfb757b6.tar.gz
Fix --tree=all print when build tree contains non-ascii
Node representation (PR #235)
-rw-r--r--src/CHANGES.txt2
-rw-r--r--src/engine/SCons/Util.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index ef4e016b..42108de1 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -34,6 +34,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
- Show --config choices if no argument is specified (PR #202).
- Fixed build crash when XML toolchain isn't installed, and
activated compression for ZIP archives.
+ - Fixed --tree=all print when build tree contains non-ascii
+ Node representation (PR #235).
From Alexandre Feblot:
- Fix for VersionedSharedLibrary under 'sunos' platform.
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index 822d5249..6dd64ece 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -264,10 +264,10 @@ def print_tree(root, child_func, prune=0, showtags=0, margin=[0], visited={}):
children = child_func(root)
if prune and rname in visited and children:
- sys.stdout.write(''.join(tags + margins + ['+-[', rname, ']']) + u'\n')
+ sys.stdout.write(''.join(tags + margins + ['+-[', rname, ']']) + '\n')
return
- sys.stdout.write(''.join(tags + margins + ['+-', rname]) + u'\n')
+ sys.stdout.write(''.join(tags + margins + ['+-', rname]) + '\n')
visited[rname] = 1