modifications dans views.py :

suppression de render_to_response au profit de render
LANGAGE SESSION_KEY remplace langage_code
string.letters n'existe plus dans python 3
cmp n'existe plus dans python 3

1 files changed, 17 insertions, 15 deletions

diff --git a/papillon/polls/views.py b/papillon/polls/views.py
index 54920b7..990c217 100644
--- a/papillon/polls/views.py
+++ b/papillon/polls/views.py
@@ -28,13 +28,14 @@ import time
 from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.http import HttpResponseRedirect
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from django.template import RequestContext
 from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ungettext
 
-from papillon.polls.models import Poll, PollUser, Choice, Voter, Vote, \
+from polls.models import Poll, PollUser, Choice, Voter, Vote, \
     Category, Comment
-from papillon.polls.forms import CreatePollForm, AdminPollForm, ChoiceForm, \
+from polls.forms import CreatePollForm, AdminPollForm, ChoiceForm, \
     DatedChoiceForm, CommentForm
 
 
@@ -46,7 +47,7 @@ def getBaseResponse(request):
     if 'language' in request.GET:
         if request.GET['language'] in \
                 [language[0] for language in settings.LANGUAGES]:
-            request.session['django_language'] = request.GET['language']
+            request.session['LANGUAGE_SESSION_KEY'] = request.GET['language'] # dans django 1.7, django_language devient LANGUAGE_SESSION_KEY 
             return None, HttpResponseRedirect(request.path)
     languages = []
     for language_code, language_label in settings.LANGUAGES:
@@ -65,8 +66,8 @@ def index(request):
         response_dct['polls'] = Poll.objects.filter(public=True, category=None)
         response_dct['categories'] = Category.objects.all()
     if 'bad_poll' in request.GET:
-        response_dct['error'] = _("The poll requested don't exist (anymore?)")
-    return render_to_response('main.html', response_dct,
+        response_dct['error'] = _("The poll requested doesn't exist (anymore?)")
+    return render(request, 'main.html', response_dct,
                               context_instance=RequestContext(request))
 
 
@@ -78,7 +79,7 @@ def category(request, category_id):
     category = Category.objects.get(id=int(category_id))
     response_dct['category'] = category
     response_dct['polls'] = Poll.objects.filter(public=True, category=category)
-    return render_to_response('category.html', response_dct)
+    return render(request, 'category.html', response_dct)
 
 
 def create(request):
@@ -90,8 +91,8 @@ def create(request):
         while not url or Poll.objects.filter(base_url=url).count() or\
                 Poll.objects.filter(admin_url=url).count():
             url = ''
-            chars = string.letters + string.digits
-            for i in xrange(6):
+            chars = string.ascii_uppercase + string.ascii_lowercase + string.digits 
+            for i in range(6):   
                 url += random_choice(chars)
             url += str(int(time.time()))
         return url
@@ -112,7 +113,7 @@ def create(request):
     else:
         form = CreatePollForm()
     response_dct['form'] = form
-    return render_to_response('create.html', response_dct)
+    return render(request, 'create.html', response_dct)
 
 
 def edit(request, admin_url):
@@ -144,7 +145,7 @@ def edit(request, admin_url):
         reverse('edit', args=[poll.admin_url]))
     response_dct['choices_url'] = request.build_absolute_uri(
         reverse('edit_choices_admin', args=[poll.admin_url]))
-    return render_to_response('edit.html', response_dct)
+    return render(request, 'edit.html', response_dct)
 
 
 def editChoicesAdmin(request, admin_url):
@@ -258,7 +259,7 @@ def editChoices(request, response_dct, admin=False):
         choice.form = Form(instance=choice)
     response_dct['choices'] = choices
     response_dct['form_new_choice'] = form
-    return render_to_response(tpl, response_dct)
+    return render(request, tpl, response_dct)
 
 
 def poll(request, poll_url):
@@ -473,8 +474,9 @@ def poll(request, poll_url):
             if choice.id not in choice_vote_ids:
                 vote = Vote(voter=voter, choice=choice, value=None)
                 vote.save()
-        voter.votes.sort(lambda x, y: cmp(choices.index(x.choice),
-                                          choices.index(y.choice)))
+        # voter.votes.sort(lambda x, y: cmp(choices.index(x.choice),
+                                          # choices.index(y.choice)))
+        voter.votes.sort(key = lambda x:(choices.index(x.choice))) 
     sums = [choice.getSum(poll.type == 'B') for choice in choices]
     vote_max = max(sums)
     c_idx = 0
@@ -507,4 +509,4 @@ def poll(request, poll_url):
             response_dct['hide_vote'] = False
     response_dct['form_comment'] = CommentForm()
     response_dct['max_comment_nb'] = settings.MAX_COMMENT_NB
-    return render_to_response('vote.html', response_dct)
+    return render(request, 'vote.html', response_dct)
\ No newline at end of file