From 217e6a7c3009c0a047f72f1a2871394412fa4cf9 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 25 Jan 2019 15:33:41 +0100 Subject: [PATCH] metadata: fix pyflakes "use ==/!= to compare str, bytes, and int literals" $ ./hooks/pre-commit || export EXITVALUE=1 WARNING: ruby is not installed, using dummy placeholder! fdroidserver/metadata.py:1180: use ==/!= to compare str, bytes, and int literals fdroidserver/metadata.py:1184: use ==/!= to compare str, bytes, and int literals fdroidserver/metadata.py:1186: use ==/!= to compare str, bytes, and int literals fdroidserver/metadata.py:1189: use ==/!= to compare str, bytes, and int literals ERROR: pyflakes tests failed! --- fdroidserver/metadata.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 49c34678..bbf8d70b 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -1177,16 +1177,16 @@ def write_yaml(mf, app): cm = ruamel.yaml.comments.CommentedMap() insert_newline = False for field in yaml_app_field_order: - if field is '\n': + if field == '\n': # next iteration will need to insert a newline insert_newline = True else: - if app.get(field) or field is 'Builds': + if app.get(field) or field == 'Builds': # .txt calls it 'builds' internally, everywhere else its 'Builds' - if field is 'Builds': + if field == 'Builds': if app.get('builds'): cm.update({field: _builds_to_yaml(app)}) - elif field is 'CurrentVersionCode': + elif field == 'CurrentVersionCode': cm.update({field: _field_to_yaml(TYPE_INT, getattr(app, field))}) else: cm.update({field: _field_to_yaml(fieldtype(field), getattr(app, field))})