diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2011-03-11 02:45:57 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2011-03-11 02:45:57 (GMT) |
| commit | 91db551873ddd734a5d7d89fa637da9e7e2d74e6 (patch) | |
| tree | b240b862d6a0a1956b63d740e9217a97fb934b89 /src | |
| parent | eeccf14f5f3de89118a7d0f883e4bbc391bbce7c (diff) | |
| download | SCons-91db551873ddd734a5d7d89fa637da9e7e2d74e6.zip SCons-91db551873ddd734a5d7d89fa637da9e7e2d74e6.tar.gz SCons-91db551873ddd734a5d7d89fa637da9e7e2d74e6.tar.bz2 | |
Fix #2685, UnicodeDecodeError with Copy and non-ASCII filenames.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Action.py | 14 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index a95ae82..97fb063 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -18,6 +18,7 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE embed manifests in Windows EXEs and DLLs. From Gary Oberbrunner: + - Fix unicode error when using non-ASCII filenames with Copy or Install - Put RPATH in LINKCOM rather than LINKFLAGS so resetting LINKFLAGS doesn't kill RPATH - Fix precompiled headers on Windows when variant dir name has spaces. diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py index 0dc5c2d..6909a9a 100644 --- a/src/engine/SCons/Action.py +++ b/src/engine/SCons/Action.py @@ -503,7 +503,18 @@ class _ActionAction(ActionBase): SCons.Util.AddMethod(self, batch_key, 'batch_key') def print_cmd_line(self, s, target, source, env): - sys.stdout.write(s + u"\n") + # In python 3, and in some of our tests, sys.stdout is + # a String io object, and it takes unicode strings only + # In other cases it's a regular Python 2.x file object + # which takes strings (bytes), and if you pass those a + # unicode object they try to decode with 'ascii' codec + # which fails if the cmd line has any hi-bit-set chars. + # This code assumes s is a regular string, but should + # work if it's unicode too. + try: + sys.stdout.write(unicode(s + "\n")) + except UnicodeDecodeError: + sys.stdout.write(s + "\n") def __call__(self, target, source, env, exitstatfunc=_null, @@ -660,7 +671,6 @@ def _subproc(scons_env, cmd, error = 'ignore', **kw): kw['env'] = new_env try: - #FUTURE return subprocess.Popen(cmd, **kw) return subprocess.Popen(cmd, **kw) except EnvironmentError, e: if error == 'raise': raise |