mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Refs #23919 -- Removed six.<various>_types usage

Browse Source 
Thanks Tim Graham and Simon Charette for the reviews.
This commit is contained in:
Claude Paroz
2016-12-29 16:27:49 +01:00
parent f6acd1d271
commit 7b2f2e74ad
213 changed files with 574 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/csrf_tests/tests.py
View File

@@ -13,7 +13,6 @@ from django.middleware.csrf import (
from django.test import SimpleTestCase, override_settings
from django.test.utils import patch_logger
from django.utils.encoding import force_bytes
from django.utils.six import text_type
from django.views.decorators.csrf import csrf_exempt, requires_csrf_token
from .views import (
@@ -65,7 +64,7 @@ class CsrfViewMiddlewareTestMixin(object):
return req
def _check_token_present(self, response, csrf_id=None):
text = text_type(response.content, response.charset)
text = str(response.content, response.charset)
match = re.search("name='csrfmiddlewaretoken' value='(.*?)'", text)
csrf_token = csrf_id or self._csrf_id
self.assertTrue(