Skip to content

Commit 8371778

Browse files
authored
Merge pull request #63 from ODM2/49-update-base-views
#49 Updated base views code and imports
2 parents 746dfc8 + a5f702c commit 8371778

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Diff for: src/cvinterface/views/base_views.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import json
1+
import requests
2+
23
from os import linesep
3-
from urllib2 import Request, urlopen
44
from string import capwords
55
from django.conf import settings
66
from django.core.mail import send_mail
@@ -12,7 +12,7 @@
1212
from django.utils.http import urlencode
1313
from django.views.generic import ListView, DetailView
1414
from django.views.generic.edit import CreateView, UpdateView
15-
from django.core.urlresolvers import reverse, reverse_lazy
15+
from django.urls import reverse, reverse_lazy
1616

1717

1818
# Vocabulary Basic Views
@@ -146,7 +146,7 @@ def post(self, request, *args, **kwargs):
146146
object = self.model.objects.get(pk=kwargs['pk'])
147147
request.POST._mutable = True
148148
for field in self.read_only:
149-
request.POST[field] = unicode(object.__getattribute__(field))
149+
request.POST[field] = object.__getattribute__(field)
150150
return super(DefaultRequestUpdateView, self).post(request, *args, **kwargs)
151151

152152
def form_valid(self, form):
@@ -267,13 +267,13 @@ def is_captcha_valid(self, form):
267267
'response': captcha_response,
268268
})
269269

270-
request = Request(url=url, data=params, headers={
270+
headers = {
271271
'Content-type': 'application/x-www-form-urlencoded',
272272
'User-agent': 'reCAPTCHA Python'
273-
})
273+
}
274274

275-
response = urlopen(request)
276-
return_values = json.loads(response.read())
275+
captcha_request = requests.get(url, params, headers=headers)
276+
return_values = captcha_request.json()
277277
return return_values["success"]
278278

279279
def form_valid(self, form):

0 commit comments

Comments
 (0)