|
1 |
| -import json |
| 1 | +import requests |
| 2 | + |
2 | 3 | from os import linesep
|
3 |
| -from urllib2 import Request, urlopen |
4 | 4 | from string import capwords
|
5 | 5 | from django.conf import settings
|
6 | 6 | from django.core.mail import send_mail
|
|
12 | 12 | from django.utils.http import urlencode
|
13 | 13 | from django.views.generic import ListView, DetailView
|
14 | 14 | 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 |
16 | 16 |
|
17 | 17 |
|
18 | 18 | # Vocabulary Basic Views
|
@@ -146,7 +146,7 @@ def post(self, request, *args, **kwargs):
|
146 | 146 | object = self.model.objects.get(pk=kwargs['pk'])
|
147 | 147 | request.POST._mutable = True
|
148 | 148 | for field in self.read_only:
|
149 |
| - request.POST[field] = unicode(object.__getattribute__(field)) |
| 149 | + request.POST[field] = object.__getattribute__(field) |
150 | 150 | return super(DefaultRequestUpdateView, self).post(request, *args, **kwargs)
|
151 | 151 |
|
152 | 152 | def form_valid(self, form):
|
@@ -267,13 +267,13 @@ def is_captcha_valid(self, form):
|
267 | 267 | 'response': captcha_response,
|
268 | 268 | })
|
269 | 269 |
|
270 |
| - request = Request(url=url, data=params, headers={ |
| 270 | + headers = { |
271 | 271 | 'Content-type': 'application/x-www-form-urlencoded',
|
272 | 272 | 'User-agent': 'reCAPTCHA Python'
|
273 |
| - }) |
| 273 | + } |
274 | 274 |
|
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() |
277 | 277 | return return_values["success"]
|
278 | 278 |
|
279 | 279 | def form_valid(self, form):
|
|
0 commit comments