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:
authorBastien Montagne <montagne29@wanadoo.fr>2020-03-20 22:49:48 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2020-03-20 22:52:52 +0300
commit9607e54985838006ca5695ed88bdaf81dda29b4c (patch)
tree4e485847825e186e0a01c6d15dcf72fc9e3e073a /release/scripts
parent3d9d132ccd4511308fbeb2d1ac323ed028a4cd9f (diff)
Fix T74959: Need to be explicit about UTF8 encoding in py.
Because some OSs are still using old 8bits specific encodings... Angry eye @windows...
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/modules/bl_i18n_utils/bl_extract_messages.py4
-rw-r--r--release/scripts/modules/bl_i18n_utils/settings.py4
-rw-r--r--release/scripts/modules/bl_i18n_utils/utils.py4
-rwxr-xr-xrelease/scripts/modules/bl_i18n_utils/utils_languages_menu.py4
4 files changed, 8 insertions, 8 deletions
diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
index 61c3a8dd52c..cee8f89abd3 100644
--- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
+++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
@@ -765,7 +765,7 @@ def dump_src_messages(msgs, reports, settings):
}
data = ""
- with open(path) as f:
+ with open(path, encoding="utf8") as f:
data = f.read()
for srch in pygettexts:
m = srch(data)
@@ -798,7 +798,7 @@ def dump_src_messages(msgs, reports, settings):
forbidden = set()
forced = set()
if os.path.isfile(settings.SRC_POTFILES):
- with open(settings.SRC_POTFILES) as src:
+ with open(settings.SRC_POTFILES, encoding="utf8") as src:
for l in src:
if l[0] == '-':
forbidden.add(l[1:].rstrip('\n'))
diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py
index e96c94d4f4e..4da9d515ffd 100644
--- a/release/scripts/modules/bl_i18n_utils/settings.py
+++ b/release/scripts/modules/bl_i18n_utils/settings.py
@@ -592,7 +592,7 @@ class I18nSettings:
# Assume it is already real JSon string...
self.from_json(fname)
return
- with open(fname) as f:
+ with open(fname, encoding="utf8") as f:
self.from_json(f.read())
# Else assume fname is already a file(like) object!
else:
@@ -600,7 +600,7 @@ class I18nSettings:
def save(self, fname):
if isinstance(fname, str):
- with open(fname, 'w') as f:
+ with open(fname, 'w', encoding="utf8") as f:
f.write(self.to_json())
# Else assume fname is already a file(like) object!
else:
diff --git a/release/scripts/modules/bl_i18n_utils/utils.py b/release/scripts/modules/bl_i18n_utils/utils.py
index 7c22a86d687..493afc53267 100644
--- a/release/scripts/modules/bl_i18n_utils/utils.py
+++ b/release/scripts/modules/bl_i18n_utils/utils.py
@@ -1158,7 +1158,7 @@ class I18n:
print("WARNING: skipping file {}, too huge!".format(path))
return None, None, None, False
txt = ""
- with open(path) as f:
+ with open(path, encoding="utf8") as f:
txt = f.read()
_in = 0
_out = len(txt)
@@ -1544,7 +1544,7 @@ class I18n:
"",
self.settings.PARSER_PY_MARKER_END,
]
- with open(dst, 'w') as f:
+ with open(dst, 'w', encoding="utf8") as f:
f.write((prev or "") + "\n".join(txt) + (nxt or ""))
self.unescape()
diff --git a/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py b/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
index 4f499476ad9..7c98faebe9d 100755
--- a/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
@@ -93,7 +93,7 @@ def gen_menu_file(stats, settings):
else:
# Non-existing, commented entry!
data_lines.append("# {} #{}:{}:{}".format(FLAG_MESSAGES[flag], uid_num, label, uid))
- with open(os.path.join(settings.TRUNK_MO_DIR, settings.LANGUAGES_FILE), 'w') as f:
+ with open(os.path.join(settings.TRUNK_MO_DIR, settings.LANGUAGES_FILE), 'w', encoding="utf8") as f:
f.write("\n".join(data_lines))
- with open(os.path.join(settings.GIT_I18N_ROOT, settings.LANGUAGES_FILE), 'w') as f:
+ with open(os.path.join(settings.GIT_I18N_ROOT, settings.LANGUAGES_FILE), 'w', encoding="utf8") as f:
f.write("\n".join(data_lines))