diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-30 01:00:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 01:00:23 +0100 |
| commit | 2fd96727b1a8b87a18d838bb95a838ff97d82fcc (patch) | |
| tree | 8e9f973bca1d67b98d76aa31c4c582880553b7ae /synapse | |
| parent | Merge pull request #3084 from NotAFile/py3-certs-byte-mode (diff) | |
| parent | open log_config in text mode too (diff) | |
| download | synapse-2fd96727b1a8b87a18d838bb95a838ff97d82fcc.tar.xz | |
Merge pull request #3085 from NotAFile/py3-config-text-mode
Open config file in non-bytes mode
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/_base.py | 6 | ||||
| -rw-r--r-- | synapse/config/logger.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 32b439d20a..b748ed2b0a 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -281,15 +281,15 @@ class Config(object): ) if not cls.path_exists(config_dir_path): os.makedirs(config_dir_path) - with open(config_path, "wb") as config_file: - config_bytes, config = obj.generate_config( + with open(config_path, "w") as config_file: + config_str, config = obj.generate_config( config_dir_path=config_dir_path, server_name=server_name, report_stats=(config_args.report_stats == "yes"), is_generating_file=True ) obj.invoke_all("generate_files", config) - config_file.write(config_bytes) + config_file.write(config_str) print(( "A config file has been generated in %r for server name" " %r with corresponding SSL keys and self-signed" diff --git a/synapse/config/logger.py b/synapse/config/logger.py index 3f70039acd..6a7228dc2f 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py @@ -117,7 +117,7 @@ class LoggingConfig(Config): log_config = config.get("log_config") if log_config and not os.path.exists(log_config): log_file = self.abspath("homeserver.log") - with open(log_config, "wb") as log_config_file: + with open(log_config, "w") as log_config_file: log_config_file.write( DEFAULT_LOG_CONFIG.substitute(log_file=log_file) ) |