From 7784b982497d1d4f2c4455108a7e98bef21ddde6 Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Sun, 2 Apr 2023 00:07:02 -0400 Subject: [PATCH 1/4] Bump version to 0.19.4 --- flox/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flox/version b/flox/version index b72b05e..c0b8d59 100644 --- a/flox/version +++ b/flox/version @@ -1 +1 @@ -0.19.3 +0.19.4 From 1a69ec1b0ea39a5ecaf852a28ea75cebee17e958 Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Sun, 2 Apr 2023 00:08:12 -0400 Subject: [PATCH 2/4] Open settings with UTF-8 encoding --- flox/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flox/__init__.py b/flox/__init__.py index 70f0d5e..17045fe 100644 --- a/flox/__init__.py +++ b/flox/__init__.py @@ -210,7 +210,7 @@ def plugindir(self): @cached_property def manifest(self): - with open(os.path.join(self.plugindir, PLUGIN_MANIFEST), 'r') as f: + with open(os.path.join(self.plugindir, PLUGIN_MANIFEST, encoding='utf-8'), 'r') as f: return json.load(f) @cached_property From 3ede9e0e6baa51d25eb4121c70cc70e2d32823dc Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Sun, 2 Apr 2023 00:12:20 -0400 Subject: [PATCH 3/4] Correct parameter placement --- flox/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flox/__init__.py b/flox/__init__.py index 17045fe..179f8e7 100644 --- a/flox/__init__.py +++ b/flox/__init__.py @@ -210,7 +210,7 @@ def plugindir(self): @cached_property def manifest(self): - with open(os.path.join(self.plugindir, PLUGIN_MANIFEST, encoding='utf-8'), 'r') as f: + with open(os.path.join(self.plugindir, PLUGIN_MANIFEST), 'r', encoding='utf-8') as f: return json.load(f) @cached_property From 69992a6e5095477744e68617d6b856ca8440c212 Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Sun, 2 Apr 2023 00:12:54 -0400 Subject: [PATCH 4/4] Use UTF-8 encoding for app settings --- flox/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flox/__init__.py b/flox/__init__.py index 179f8e7..33e66bb 100644 --- a/flox/__init__.py +++ b/flox/__init__.py @@ -236,7 +236,7 @@ def appdata(self): @property def app_settings(self): - with open(os.path.join(self.appdata, 'Settings', 'Settings.json'), 'r') as f: + with open(os.path.join(self.appdata, 'Settings', 'Settings.json'), 'r', encoding='utf-8') as f: return json.load(f) @property