Nettoyage (PEP8)

This commit is contained in:
Martin Pépin 2016-07-14 00:13:30 +02:00
parent 1fc83d15ba
commit 86a1fa7d55

View file

@ -1,5 +1,4 @@
from django.shortcuts import render, redirect, HttpResponse, render_to_response,\
get_object_or_404
from django.shortcuts import render, HttpResponse, get_object_or_404
from django.contrib.auth.decorators import login_required
from django.utils.encoding import smart_str
from django.forms.models import modelform_factory
@ -9,9 +8,10 @@ import os
from partitions.forms import UploadFileForm, UploadMorceauForm
from partitions.models import Partition, PartitionSet, PARTITION_TYPES
from partitions.models import Partition, PartitionSet
from partitions.decorators import chef_required
def liste(request):
partitions = PartitionSet.objects.order_by("nom")
context = {
@ -22,9 +22,10 @@ def liste(request):
}
return render(request, 'partitions/liste.html', context)
@login_required
def upload(request, nom, auteur):
if request.method =="POST":
if request.method == "POST":
form = UploadFileForm(request.POST, request.FILES)
if form.is_valid():
partition = Partition()
@ -38,13 +39,14 @@ def upload(request, nom, auteur):
partition.morceau = mor
try:
mor.partition_set.get(nom=partition.nom)
error="Un morceau du même nom existe déjà"
error = "Un morceau du même nom existe déjà"
except Partition.DoesNotExist:
partition.save()
sauvegarde = True
else:
form = UploadFileForm()
return render(request, 'partitions/upload.html', locals())
form = UploadFileForm()
return render(request, 'partitions/upload.html', locals())
@login_required
def see(request, nom, auteur, partition_id):
@ -68,9 +70,10 @@ def see(request, nom, auteur, partition_id):
return response
else:
partitions = PartitionSet.objects.get(nom=nom, auteur=auteur)
part = partitions.partition_set.all()
part = partitions.partition_set.all()
return render(request, 'partitions/listepart.html', locals())
@login_required
def download(request, nom, auteur, partition_id):
partition = get_object_or_404(Partition, id=partition_id)
@ -83,6 +86,7 @@ def download(request, nom, auteur, partition_id):
nom, auteur, smart_str(os.path.basename(myfile.name)))
return response
@login_required
def ajouter_morceau(request):
if request.method == "POST":
@ -96,7 +100,8 @@ def ajouter_morceau(request):
form = UploadMorceauForm()
return render(request, 'partitions/new.html', locals())
try:
PartitionSet.objects.get(nom=partitionset.nom, auteur=partitionset.auteur)
PartitionSet.objects.get(nom=partitionset.nom,
auteur=partitionset.auteur)
error = "Un morceau du même nom existe déjà"
except PartitionSet.DoesNotExist:
partitionset.save()
@ -105,6 +110,7 @@ def ajouter_morceau(request):
form = UploadMorceauForm()
return render(request, 'partitions/new.html', locals())
@chef_required
def delete(request, nom, auteur, id):
p = PartitionSet.objects.get(nom=nom, auteur=auteur)
@ -115,11 +121,13 @@ def delete(request, nom, auteur, id):
part = p.partition_set.all()
return render(request, 'partitions/listepart.html', locals())
@chef_required
def conf_delete(request, nom, auteur, id):
part = Partition.objects.get(id=id)
return render(request, 'partitions/conf_delete.html', locals())
@chef_required
def delete_morc(request, nom, auteur):
p = PartitionSet.objects.get(nom=nom, auteur=auteur)
@ -130,15 +138,18 @@ def delete_morc(request, nom, auteur):
partitions = PartitionSet.objects.all()
return render(request, "partitions/liste.html", locals())
@chef_required
def conf_delete_morc(request, nom, auteur):
return render(request, 'partitions/conf_delete_morc.html', locals())
@login_required
def listepart(request, nom, auteur):
p = PartitionSet.objects.get(nom=nom, auteur=auteur)
part = p.partition_set.all()
ChefEditForm = modelform_factory(PartitionSet, fields=("category", "infos"))
ChefEditForm = modelform_factory(PartitionSet,
fields=("category", "infos"))
if request.method == "POST" and request.user.profile.is_chef:
form = ChefEditForm(request.POST, instance=p)
if form.is_valid():
@ -146,4 +157,3 @@ def listepart(request, nom, auteur):
else:
form = ChefEditForm(instance=p)
return render(request, 'partitions/listepart.html', locals())