From 9d12770921fa229ce4716f4a210a467582f0920d Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 14 Jun 2015 16:33:38 -0700 Subject: rolling back unicode --tree=all patch --- src/CHANGES.txt | 2 -- src/engine/SCons/Util.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 42108de..ef4e016 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 6dd64ec..822d524 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 -- cgit v0.12