From 483ddf0f86d3ccd3e7ca925565868083e91bf1d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= Date: Sat, 9 Jul 2016 23:26:02 +0100 Subject: [PATCH] PEP8: Forgot a few binops --- bda/admin.py | 4 ++-- gestioncof/admin.py | 4 ++-- gestioncof/csv_views.py | 4 ++-- gestioncof/forms.py | 3 +-- gestioncof/petits_cours_views.py | 12 ++++++------ tirage_bda.py | 8 ++++---- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/bda/admin.py b/bda/admin.py index bcbc6069..58228e7e 100644 --- a/bda/admin.py +++ b/bda/admin.py @@ -119,8 +119,8 @@ Le Bureau des Arts else: message_bit = u"%d membres ont" % count plural = "s" - self.message_user(request, u"%s été informé%s avec succès." % - (message_bit, plural)) + self.message_user(request, u"%s été informé%s avec succès." + % (message_bit, plural)) send_attribs.short_description = u"Envoyer les résultats par mail" diff --git a/gestioncof/admin.py b/gestioncof/admin.py index 3d5e8891..bb03bbd4 100644 --- a/gestioncof/admin.py +++ b/gestioncof/admin.py @@ -24,8 +24,8 @@ def add_link_field(target_model='', field='', link_text=unicode, if not link_obj.id: return "" url = reverse(reverse_path, args=(link_obj.id,)) - return mark_safe("%s" % - (url, link_text(link_obj))) + return mark_safe("%s" + % (url, link_text(link_obj))) link.allow_tags = True link.short_description = desc_text(reverse_name + ' link') cls.link = link diff --git a/gestioncof/csv_views.py b/gestioncof/csv_views.py index 6ba59d26..733768dc 100644 --- a/gestioncof/csv_views.py +++ b/gestioncof/csv_views.py @@ -7,8 +7,8 @@ from django.apps import apps def export(qs, fields=None): model = qs.model response = HttpResponse(content_type='text/csv') - response['Content-Disposition'] = 'attachment; filename=%s.csv' %\ - slugify(model.__name__) + response['Content-Disposition'] = 'attachment; filename=%s.csv' \ + % slugify(model.__name__) writer = csv.writer(response) # Write headers to CSV file if fields: diff --git a/gestioncof/forms.py b/gestioncof/forms.py index ed749814..bf983df5 100644 --- a/gestioncof/forms.py +++ b/gestioncof/forms.py @@ -108,8 +108,7 @@ class SurveyStatusFilterForm(forms.Form): else: initial = "none" field = forms.ChoiceField( - label="%s : %s" % - (question.question, answer.answer), + label="%s : %s" % (question.question, answer.answer), choices=[("yes", "yes"), ("no", "no"), ("none", "none")], widget=TriStateCheckbox, required=False, diff --git a/gestioncof/petits_cours_views.py b/gestioncof/petits_cours_views.py index 89bfe36e..2e8c420a 100644 --- a/gestioncof/petits_cours_views.py +++ b/gestioncof/petits_cours_views.py @@ -186,8 +186,8 @@ def _traitement_other_preparing(request, demande): continue user = candidates[choice] if user in proposals[matiere]: - errors.append(u"La proposition %d en %s est un doublon" % - (choice_id + 1, matiere)) + errors.append(u"La proposition %d en %s est un doublon" + % (choice_id + 1, matiere)) continue proposals[matiere].append(user) attribdata[matiere.id].append(user.id) @@ -198,10 +198,10 @@ def _traitement_other_preparing(request, demande): if not proposals[matiere]: errors.append(u"Aucune proposition pour %s" % (matiere,)) elif len(proposals[matiere]) < 3: - errors.append(u"Seulement %d proposition%s pour %s" % - (len(proposals[matiere]), "s" - if len(proposals[matiere]) > 1 else "", - matiere)) + errors.append(u"Seulement %d proposition%s pour %s" + % (len(proposals[matiere]), + "s" if len(proposals[matiere]) > 1 else "", + matiere)) else: unsatisfied.append(matiere) return _finalize_traitement(request, demande, proposals, proposed_for, diff --git a/tirage_bda.py b/tirage_bda.py index 8d01d6c6..502cb45e 100644 --- a/tirage_bda.py +++ b/tirage_bda.py @@ -26,8 +26,8 @@ if __name__ == "__main__": print "%d places" % available_slots print "%d participants" % len(members) print "%d demandes" % len(choices) - print "%d places demandées" % (len(choices) + - len(choices.filter(double=True).all())) + print "%d places demandées" % (len(choices) + + len(choices.filter(double=True).all())) print "%.02f€ à brasser" % total_price print "Récupération: %.2fs" % (time.time() - start) start_init = time.time() @@ -57,8 +57,8 @@ if __name__ == "__main__": members2[member].append(show) member.total += show.price if len(members) < show.slots: - print "%d place(s) invendue(s) pour %s" %\ - (show.slots - len(members), show) + print "%d place(s) invendue(s) pour %s" \ + % (show.slots - len(members), show) members2 = members2.items() print "Temps total: %.2fs" % (time.time() - start) print "Requêtes SQL:"