From 21a6f0b12c3e0db147b73b26fa465460f46a3bd8 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Mon, 9 Sep 2019 16:34:47 +0100 Subject: Read all files as UTF-8 --- synapse/config/_base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'synapse/config/_base.py') diff --git a/synapse/config/_base.py b/synapse/config/_base.py index f7d7f153bb..ae05667a40 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -15,6 +15,7 @@ import argparse import errno +from io import open import os from textwrap import dedent @@ -131,7 +132,7 @@ class Config(object): @classmethod def read_file(cls, file_path, config_name): cls.check_file(file_path, config_name) - with open(file_path) as file_stream: + with open(file_path, encoding="utf-8") as file_stream: return file_stream.read() @staticmethod -- cgit 1.5.1 From b0eec085bd518e76cf96b84f98e90860dca1a5c7 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Mon, 9 Sep 2019 16:41:46 +0100 Subject: Lint --- synapse/config/_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'synapse/config/_base.py') diff --git a/synapse/config/_base.py b/synapse/config/_base.py index ae05667a40..71a81c1cc9 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -15,8 +15,8 @@ import argparse import errno -from io import open import os +from io import open from textwrap import dedent from six import integer_types -- cgit 1.5.1 From c8f03a8fb0160956c5c593f63641e9a522ee2b8e Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Mon, 9 Sep 2019 17:13:37 +0100 Subject: Rename io.open import to limite side-effects --- synapse/config/_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'synapse/config/_base.py') diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 71a81c1cc9..bf039e5823 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -16,7 +16,7 @@ import argparse import errno import os -from io import open +from io import open as io_open from textwrap import dedent from six import integer_types @@ -132,7 +132,7 @@ class Config(object): @classmethod def read_file(cls, file_path, config_name): cls.check_file(file_path, config_name) - with open(file_path, encoding="utf-8") as file_stream: + with io_open(file_path, encoding="utf-8") as file_stream: return file_stream.read() @staticmethod -- cgit 1.5.1