diff options
| author | William Deegan <bill@baddogconsulting.com> | 2015-06-14 16:33:38 -0700 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2015-06-14 16:33:38 -0700 |
| commit | 86b35c127b889b9466acbb2199dbcab5b0487d02 (patch) | |
| tree | 1a06d45cb37394f21a9e11539ab4ac5572488fe6 | |
| parent | fa5780fd08cdca7ca5e51e63ffcb8f870955ea38 (diff) | |
| download | scons-86b35c127b889b9466acbb2199dbcab5b0487d02.tar.gz | |
rolling back unicode --tree=all patch
| -rw-r--r-- | src/CHANGES.txt | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Util.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 42108de1..ef4e016b 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -34,8 +34,6 @@ 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 6dd64ece..822d5249 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, ']']) + '\n') + sys.stdout.write(''.join(tags + margins + ['+-[', rname, ']']) + u'\n') return - sys.stdout.write(''.join(tags + margins + ['+-', rname]) + '\n') + sys.stdout.write(''.join(tags + margins + ['+-', rname]) + u'\n') visited[rname] = 1 |