From 73a7c131ba50d5be7540c188f20df2efa4df0814 Mon Sep 17 00:00:00 2001 From: blag Date: Wed, 16 Dec 2020 03:18:07 -0800 Subject: [PATCH 1/2] Decode pack files as utf-8 instead of ascii --- st2common/st2common/content/loader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/st2common/st2common/content/loader.py b/st2common/st2common/content/loader.py index 3baa1e767b..efd9a2c005 100644 --- a/st2common/st2common/content/loader.py +++ b/st2common/st2common/content/loader.py @@ -243,7 +243,7 @@ def load(self, file_path, expected_type=None): return result def _load(self, parser_func, file_path): - with open(file_path, 'r') as fd: + with open(file_path, 'r', encoding='utf-8') as fd: try: return parser_func(fd) except ValueError: From 696b75246ab49bc1cce00553f7f509e0467c0756 Mon Sep 17 00:00:00 2001 From: blag Date: Wed, 16 Dec 2020 03:21:29 -0800 Subject: [PATCH 2/2] Update the changelog --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c69ede37dd..6f24301dfe 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -41,6 +41,8 @@ Fixed Contributed by @guzzijones +* StackStorm now explicitly decodes pack files as utf-8 instead of implicitly as ascii (bug fix) #5106 + Removed ~~~~~~~~ * Removed check-licence script (cleanup) #5092