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

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVilém Duha <vilda.novak@gmail.com>2021-01-18 16:16:58 +0300
committerVilém Duha <vilda.novak@gmail.com>2021-01-18 16:16:58 +0300
commitaf50ac234088b0d7eeab54cd498c0318a1f95c76 (patch)
tree67ca7af94560f36f2a3a5a0d35e82ce5b4a07e6f /blenderkit/resolutions.py
parentd59052f4d5ed74fdb49ddd4529215560af041715 (diff)
BlenderKit: fix T84766 - Specify utf-8 encoding for all json file write/reads
This is used on various places of the addon, and was introduced to fix (once more and better) T48766.
Diffstat (limited to 'blenderkit/resolutions.py')
-rw-r--r--blenderkit/resolutions.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/blenderkit/resolutions.py b/blenderkit/resolutions.py
index 03026c68..a5b5d723 100644
--- a/blenderkit/resolutions.py
+++ b/blenderkit/resolutions.py
@@ -632,8 +632,8 @@ def get_assets_search():
retries += 1
fpath = assets_db_path()
- with open(fpath, 'w') as s:
- json.dump(results, s)
+ with open(fpath, 'w', encoding = 'utf-8') as s:
+ json.dump(results, s, ensure_ascii=False, indent=4)
def get_assets_for_resolutions(page_size=100, max_results=100000000):
@@ -698,13 +698,13 @@ def get_materials_for_validation(page_size=100, max_results=100000000):
# retries += 1
#
# fpath = assets_db_path()
-# with open(fpath, 'w') as s:
-# json.dump(results, s)
+# with open(fpath, 'w', encoding = 'utf-8') as s:
+# json.dump(results, s, ensure_ascii=False, indent=4)
def load_assets_list(filepath):
if os.path.exists(filepath):
- with open(filepath, 'r') as s:
+ with open(filepath, 'r', encoding='utf-8') as s:
assets = json.load(s)
return assets
@@ -821,8 +821,8 @@ def send_to_bg(asset_data, fpath, command='generate_resolutions', wait=True):
tempdir = tempfile.mkdtemp()
datafile = os.path.join(tempdir + 'resdata.json')
script_path = os.path.dirname(os.path.realpath(__file__))
- with open(datafile, 'w') as s:
- json.dump(data, s)
+ with open(datafile, 'w', encoding = 'utf-8') as s:
+ json.dump(data, s, ensure_ascii=False, indent=4)
print('opening Blender instance to do processing - ', command)
@@ -856,7 +856,7 @@ def write_data_back(asset_data):
def run_bg(datafile):
print('background file operation')
- with open(datafile, 'r') as f:
+ with open(datafile, 'r',encoding='utf-8') as f:
data = json.load(f)
bpy.app.debug_value = data['debug_value']
write_data_back(data['asset_data'])