diff options
| -rwxr-xr-x | build_files/cmake/project_info.py | 4 | ||||
| -rw-r--r-- | build_files/cmake/project_source_info.py | 4 | ||||
| -rw-r--r-- | doc/manpage/blender.1.py | 4 | ||||
| -rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 34 |
5 files changed, 25 insertions, 23 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() diff --git a/build_files/cmake/project_source_info.py b/build_files/cmake/project_source_info.py index 5d646eea2c1..d4b48ccd859 100644 --- a/build_files/cmake/project_source_info.py +++ b/build_files/cmake/project_source_info.py @@ -73,7 +73,7 @@ def do_ignore(filepath, ignore_prefix_list): def makefile_log(): import subprocess import time - # Check blender is not 2.5x until it supports playback again + print("running make with --dry-run ...") process = subprocess.Popen(["make", "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"], stdout=subprocess.PIPE, @@ -85,7 +85,7 @@ def makefile_log(): out = process.stdout.read() process.stdout.close() print("done!", len(out), "bytes") - return out.decode("ascii").split("\n") + return out.decode("utf-8", errors="ignore").split("\n") def build_info(use_c=True, use_cxx=True, ignore_prefix_list=None): 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") diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 9cbd6824bbb..fc17b9a24a5 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -658,7 +658,7 @@ def pycontext2sphinx(BASEPATH): char_array = c_char_p_p.from_address(attr) i = 0 while char_array[i] is not None: - member = ctypes.string_at(char_array[i]).decode() + member = ctypes.string_at(char_array[i]).decode(encoding="ascii") fw(".. data:: %s\n\n" % member) member_type, is_seq = type_map[member] fw(" :type: %s :class:`bpy.types.%s`\n\n" % ("sequence of " if is_seq else "", member_type)) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 6bf8dd82c9b..a2a4405f77a 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1830,32 +1830,32 @@ class VIEW3D_MT_edit_text_chars(Menu): def draw(self, context): layout = self.layout - layout.operator("font.text_insert", text="Copyright|Alt C").text = b'\xC2\xA9'.decode() - layout.operator("font.text_insert", text="Registered Trademark|Alt R").text = b'\xC2\xAE'.decode() + layout.operator("font.text_insert", text="Copyright|Alt C").text = "\u00A9" + layout.operator("font.text_insert", text="Registered Trademark|Alt R").text = "\u00AE" layout.separator() - layout.operator("font.text_insert", text="Degree Sign|Alt G").text = b'\xC2\xB0'.decode() - layout.operator("font.text_insert", text="Multiplication Sign|Alt x").text = b'\xC3\x97'.decode() - layout.operator("font.text_insert", text="Circle|Alt .").text = b'\xC2\x8A'.decode() - layout.operator("font.text_insert", text="Superscript 1|Alt 1").text = b'\xC2\xB9'.decode() - layout.operator("font.text_insert", text="Superscript 2|Alt 2").text = b'\xC2\xB2'.decode() - layout.operator("font.text_insert", text="Superscript 3|Alt 3").text = b'\xC2\xB3'.decode() - layout.operator("font.text_insert", text="Double >>|Alt >").text = b'\xC2\xBB'.decode() - layout.operator("font.text_insert", text="Double <<|Alt <").text = b'\xC2\xAB'.decode() - layout.operator("font.text_insert", text="Promillage|Alt %").text = b'\xE2\x80\xB0'.decode() + layout.operator("font.text_insert", text="Degree Sign|Alt G").text = "\u00B0" + layout.operator("font.text_insert", text="Multiplication Sign|Alt x").text = "\u00D7" + layout.operator("font.text_insert", text="Circle|Alt .").text = "\u008A" + layout.operator("font.text_insert", text="Superscript 1|Alt 1").text = "\u00B9" + layout.operator("font.text_insert", text="Superscript 2|Alt 2").text = "\u00B2" + layout.operator("font.text_insert", text="Superscript 3|Alt 3").text = "\u00B3" + layout.operator("font.text_insert", text="Double >>|Alt >").text = "\u00BB" + layout.operator("font.text_insert", text="Double <<|Alt <").text = "\u00AB" + layout.operator("font.text_insert", text="Promillage|Alt %").text = "\u2030" layout.separator() - layout.operator("font.text_insert", text="Dutch Florin|Alt F").text = b'\xC2\xA4'.decode() - layout.operator("font.text_insert", text="British Pound|Alt L").text = b'\xC2\xA3'.decode() - layout.operator("font.text_insert", text="Japanese Yen|Alt Y").text = b'\xC2\xA5'.decode() + layout.operator("font.text_insert", text="Dutch Florin|Alt F").text = "\u00A4" + layout.operator("font.text_insert", text="British Pound|Alt L").text = "\u00A3" + layout.operator("font.text_insert", text="Japanese Yen|Alt Y").text = "\u00A5" layout.separator() - layout.operator("font.text_insert", text="German S|Alt S").text = b'\xC3\x9F'.decode() - layout.operator("font.text_insert", text="Spanish Question Mark|Alt ?").text = b'\xC2\xBF'.decode() - layout.operator("font.text_insert", text="Spanish Exclamation Mark|Alt !").text = b'\xC2\xA1'.decode() + layout.operator("font.text_insert", text="German S|Alt S").text = "\u00DF" + layout.operator("font.text_insert", text="Spanish Question Mark|Alt ?").text = "\u00BF" + layout.operator("font.text_insert", text="Spanish Exclamation Mark|Alt !").text = "\u00A1" class VIEW3D_MT_edit_meta(Menu): |