From 159d5a5d9e7339e54b7306f832fdb8c687da8606 Mon Sep 17 00:00:00 2001 From: katnyaa Date: Mon, 22 May 2017 15:03:34 +0100 Subject: [PATCH] Fix lint errors --- nyaa/api_handler.py | 8 ++++---- nyaa/backend.py | 2 +- nyaa/forms.py | 1 - nyaa/routes.py | 7 +++++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/nyaa/api_handler.py b/nyaa/api_handler.py index ade1e2b..665511b 100644 --- a/nyaa/api_handler.py +++ b/nyaa/api_handler.py @@ -107,7 +107,7 @@ def api_upload(upload_request, user): return flask.make_response(flask.jsonify( {'Failure': ['No torrent file was attached.']}), 400) - form = forms.UploadForm(CombinedMultiDict((torrent_file, form_info)), meta={'csrf':False}) + form = forms.UploadForm(CombinedMultiDict((torrent_file, form_info)), meta={'csrf': False}) form.category.choices = _create_upload_category_choices() if upload_request.method == 'POST' and form.validate(): @@ -138,7 +138,7 @@ UPLOAD_API_FORM_KEYMAP = { } UPLOAD_API_FORM_KEYMAP_REVERSE = {v: k for k, v in UPLOAD_API_FORM_KEYMAP.items()} UPLOAD_API_DEFAULTS = { - 'name' : '', + 'name': '', 'category': '', 'anonymous': False, 'hidden': False, @@ -169,7 +169,7 @@ def v2_api_upload(): mapped_dict[mapped_key] = request_data.get(key, default) # Flask-WTF (very helpfully!!) automatically grabs the request form, so force a None formdata - upload_form = forms.UploadForm(None, data=mapped_dict, meta={'csrf':False}) + upload_form = forms.UploadForm(None, data=mapped_dict, meta={'csrf': False}) upload_form.category.choices = _create_upload_category_choices() if upload_form.validate(): @@ -193,7 +193,7 @@ def v2_api_upload(): # #################################### TEMPORARY #################################### -from orderedset import OrderedSet +from orderedset import OrderedSet # noqa: E402 @api_blueprint.route('/ghetto_import', methods=['POST']) diff --git a/nyaa/backend.py b/nyaa/backend.py index a9ea97e..1c96095 100644 --- a/nyaa/backend.py +++ b/nyaa/backend.py @@ -73,7 +73,7 @@ def handle_torrent_upload(upload_form, uploading_user=None, fromAPI=False): # Copy trusted status from user if possible can_mark_trusted = uploading_user and uploading_user.is_trusted # To do, automatically mark trusted if user is trusted unless user specifies otherwise - torrent.trusted = upload_form.is_trusted.data if can_mark_trusted else False + torrent.trusted = upload_form.is_trusted.data if can_mark_trusted else False # Set category ids torrent.main_category_id, torrent.sub_category_id = \ diff --git a/nyaa/forms.py b/nyaa/forms.py index f1626d9..1a61706 100644 --- a/nyaa/forms.py +++ b/nyaa/forms.py @@ -166,7 +166,6 @@ class EditForm(FlaskForm): class UploadForm(FlaskForm): - torrent_file = FileField('Torrent file', [ FileRequired() ]) diff --git a/nyaa/routes.py b/nyaa/routes.py index 7dda5e5..013d842 100644 --- a/nyaa/routes.py +++ b/nyaa/routes.py @@ -215,7 +215,9 @@ def home(rss): query_results = search_elastic(**query_args) if render_as_rss: - return render_rss('"{}"'.format(search_term), query_results, use_elastic=True, magnet_links=use_magnet_links) + return render_rss( + '"{}"'.format(search_term), query_results, + use_elastic=True, magnet_links=use_magnet_links) else: rss_query_string = _generate_query_string( search_term, category, quality_filter, user_name) @@ -637,7 +639,8 @@ def edit_torrent(torrent_id): db.session.commit() flask.flash(flask.Markup( - 'Torrent has been successfully edited! Changes might take a few minutes to show up.'), 'info') + 'Torrent has been successfully edited! Changes might take a few minutes to show up.'), + 'info') return flask.redirect(flask.url_for('view_torrent', torrent_id=torrent.id)) else: