From 822439dff524c852cbe67b33b9b20f476b3308fb Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 2 May 2023 11:49:17 +0200 Subject: [PATCH] remove exception for ruamel.yaml on Debian/stretch stretch is no more, and this code base specifies Python 3.9 as minimum. --- fdroidserver/metadata.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 1298f255..5f16beac 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -940,12 +940,9 @@ def write_yaml(mf, app): return builds yaml_app = _app_to_yaml(app) - try: - yaml = ruamel.yaml.YAML() - yaml.indent(mapping=4, sequence=4, offset=2) - yaml.dump(yaml_app, stream=mf) - except AttributeError: # Debian/stretch's version does not have YAML() - ruamel.yaml.round_trip_dump(yaml_app, mf, indent=4, block_seq_indent=2) + yaml = ruamel.yaml.YAML() + yaml.indent(mapping=4, sequence=4, offset=2) + yaml.dump(yaml_app, stream=mf) def write_metadata(metadatapath, app):