diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-17 08:05:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-17 08:05:54 +0400 |
commit | 1cfbde0eb469f7d827b73667d7406eddc0065ceb (patch) | |
tree | 3765064220fa1247eab3240ccd464f49aa2962f4 /build_files/cmake/project_info.py | |
parent | 68fa959de56f09f2dd575408699e4284eac77857 (diff) |
pass encoding to uses of decode() incase the default isnt utf-8. ignore decode errors in some cases.
This should fix an error with generated qtcreator projects.
also replace decoded bytes for unicode escape sequences in the VIEW3D_MT_edit_text_chars menu.
Diffstat (limited to 'build_files/cmake/project_info.py')
-rwxr-xr-x | build_files/cmake/project_info.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py index 0b922979a63..7162b324f94 100755 --- a/build_files/cmake/project_info.py +++ b/build_files/cmake/project_info.py @@ -224,7 +224,9 @@ def project_name_get(path, fallback="Blender", prefix="Blender_"): import subprocess info = subprocess.Popen(["svn", "info", path], - stdout=subprocess.PIPE).communicate()[0].decode() + stdout=subprocess.PIPE).communicate()[0] + # string version, we only want the URL + info = info.decode(encoding="utf-8", errors="ignore") for l in info.split("\n"): l = l.strip() |