Skip to content
Snippets Groups Projects
Commit e3a39f25 authored by Shirlei Chaves's avatar Shirlei Chaves
Browse files

Alter request.REQUEST to request.GET

Step toward future django version upgrade
Currently, the following warning is received:
RemovedInDjango19Warning: `request.REQUEST` is deprecated, use `request.GET` or `request.POST` instead.
parent 0b7da7a9
No related branches found
No related tags found
No related merge requests found
...@@ -513,7 +513,7 @@ def encrypt_ballot(request, election): ...@@ -513,7 +513,7 @@ def encrypt_ballot(request, election):
(list of list because each question could have a list of answers if more than one.) (list of list because each question could have a list of answers if more than one.)
""" """
# FIXME: maybe make this just request.POST at some point? # FIXME: maybe make this just request.POST at some point?
answers = utils.from_json(request.REQUEST['answers_json']) answers = utils.from_json(request.GET['answers_json'])
ev = homomorphic.EncryptedVote.fromElectionAndAnswers(election, answers) ev = homomorphic.EncryptedVote.fromElectionAndAnswers(election, answers)
return ev.ld_object.includeRandomness().toJSONDict() return ev.ld_object.includeRandomness().toJSONDict()
...@@ -552,7 +552,7 @@ def password_voter_login(request, election): ...@@ -552,7 +552,7 @@ def password_voter_login(request, election):
""" """
# the URL to send the user to after they've logged in # the URL to send the user to after they've logged in
return_url = request.REQUEST.get('return_url', reverse(one_election_cast_confirm, args=[election.uuid])) return_url = request.GET.get('return_url', reverse(one_election_cast_confirm, args=[election.uuid]))
bad_voter_login = (request.GET.get('bad_voter_login', "0") == "1") bad_voter_login = (request.GET.get('bad_voter_login', "0") == "1")
if request.method == "GET": if request.method == "GET":
...@@ -568,7 +568,7 @@ def password_voter_login(request, election): ...@@ -568,7 +568,7 @@ def password_voter_login(request, election):
'password_login_form': password_login_form, 'password_login_form': password_login_form,
'bad_voter_login' : bad_voter_login}) 'bad_voter_login' : bad_voter_login})
login_url = request.REQUEST.get('login_url', None) login_url = request.GET.get('login_url', None)
if not login_url: if not login_url:
# login depending on whether this is a private election # login depending on whether this is a private election
...@@ -1339,11 +1339,11 @@ def voters_email(request, election): ...@@ -1339,11 +1339,11 @@ def voters_email(request, election):
('result', 'Election Result') ('result', 'Election Result')
] ]
template = request.REQUEST.get('template', 'vote') template = request.GET.get('template', 'vote')
if not template in [t[0] for t in TEMPLATES]: if not template in [t[0] for t in TEMPLATES]:
raise Exception("bad template") raise Exception("bad template")
voter_id = request.REQUEST.get('voter_id', None) voter_id = request.GET.get('voter_id', None)
if voter_id: if voter_id:
voter = Voter.get_by_election_and_voter_id(election, voter_id) voter = Voter.get_by_election_and_voter_id(election, voter_id)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment