diff options
| author | Jonathan de Jong <jonathan@automatia.nl> | 2021-07-19 16:28:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 15:28:05 +0100 |
| commit | 95e47b2e782b5e7afa5fd2afd1d0ea7745eaac36 (patch) | |
| tree | 790fadd03146a98be794c3d26b34224241a26271 /synapse/config | |
| parent | Remove unused `events_by_room` (#10421) (diff) | |
| download | synapse-95e47b2e782b5e7afa5fd2afd1d0ea7745eaac36.tar.xz | |
[pyupgrade] `synapse/` (#10348)
This PR is tantamount to running ``` pyupgrade --py36-plus --keep-percent-format `find synapse/ -type f -name "*.py"` ``` Part of #9744
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/appservice.py | 2 | ||||
| -rw-r--r-- | synapse/config/tls.py | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/synapse/config/appservice.py b/synapse/config/appservice.py index a39d457c56..1ebea88db2 100644 --- a/synapse/config/appservice.py +++ b/synapse/config/appservice.py @@ -64,7 +64,7 @@ def load_appservices(hostname, config_files): for config_file in config_files: try: - with open(config_file, "r") as f: + with open(config_file) as f: appservice = _load_appservice(hostname, yaml.safe_load(f), config_file) if appservice.id in seen_ids: raise ConfigError( diff --git a/synapse/config/tls.py b/synapse/config/tls.py index fed05ac7be..5679f05e42 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -66,10 +66,8 @@ class TlsConfig(Config): if self.federation_client_minimum_tls_version == "1.3": if getattr(SSL, "OP_NO_TLSv1_3", None) is None: raise ConfigError( - ( - "federation_client_minimum_tls_version cannot be 1.3, " - "your OpenSSL does not support it" - ) + "federation_client_minimum_tls_version cannot be 1.3, " + "your OpenSSL does not support it" ) # Whitelist of domains to not verify certificates for |