diff options
| author | anatoly techtonik <techtonik@gmail.com> | 2015-05-18 16:56:04 +0300 |
|---|---|---|
| committer | anatoly techtonik <techtonik@gmail.com> | 2015-05-18 16:56:04 +0300 |
| commit | 6a63deeace54613c91004535bc3d593bb161430e (patch) | |
| tree | 4f1173f16765e4e8772e3d099b937cb855f699ff | |
| parent | 7ac97ed9d43883d1322dc1d3a775ccc6da049b26 (diff) | |
| download | scons-git-6a63deeace54613c91004535bc3d593bb161430e.tar.gz | |
Fix --tree=all print when build tree contains non-ascii
Node representation (PR #235)
| -rw-r--r-- | src/CHANGES.txt | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Util.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index ef4e016b0..42108de1a 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 822d5249a..6dd64ece8 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 |