Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-11-17 08:05:54 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-17 08:05:54 +0400
commit1cfbde0eb469f7d827b73667d7406eddc0065ceb (patch)
tree3765064220fa1247eab3240ccd464f49aa2962f4 /doc/manpage
parent68fa959de56f09f2dd575408699e4284eac77857 (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 'doc/manpage')
-rw-r--r--doc/manpage/blender.1.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/manpage/blender.1.py b/doc/manpage/blender.1.py
index 21df42a4082..0d43daccc5e 100644
--- a/doc/manpage/blender.1.py
+++ b/doc/manpage/blender.1.py
@@ -52,9 +52,9 @@ else:
cmd = [blender_bin, "--help"]
print(" executing:", " ".join(cmd))
-blender_help = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0].decode()
+blender_help = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0].decode(encoding="utf-8")
-blender_version = subprocess.Popen([blender_bin, "--version"], stdout=subprocess.PIPE).communicate()[0].decode().strip()
+blender_version = subprocess.Popen([blender_bin, "--version"], stdout=subprocess.PIPE).communicate()[0].decode(encoding="utf-8").strip()
blender_version = blender_version.split("Build")[0]
date_string = datetime.date.fromtimestamp(time.time()).strftime("%B %d, %Y")