encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-09 08:00:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Better Python < 3 compatibility.

Browse Source
This commit is contained in:
Max Peterson 2014-04-28 13:13:51 +01:00
parent 170fa10ae0
commit 73597a16a2
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rest_framework/tests/test_authentication.py
View File

@ -19,7 +19,7 @@ from rest_framework.authentication import (
OAuth2Authentication OAuth2Authentication
) )
from rest_framework.authtoken.models import Token from rest_framework.authtoken.models import Token
from rest_framework.compat import patterns, url, include from rest_framework.compat import patterns, url, include, six
from rest_framework.compat import oauth2_provider, oauth2_provider_scope from rest_framework.compat import oauth2_provider, oauth2_provider_scope
from rest_framework.compat import oauth, oauth_provider from rest_framework.compat import oauth, oauth_provider
from rest_framework.test import APIRequestFactory, APIClient from rest_framework.test import APIRequestFactory, APIClient
@ -199,13 +199,7 @@ class TokenAuthTests(TestCase):
"""Ensure generate_key returns a string""" """Ensure generate_key returns a string"""
token = Token() token = Token()
key = token.generate_key() key = token.generate_key()
try: self.assertTrue(isinstance(key, six.string_types))
# added in Python < 3
base = unicode
except NameError:
# added in Python >= 3
base = str
self.assertTrue(isinstance(key, base))
def test_token_login_json(self): def test_token_login_json(self):
"""Ensure token login view using JSON POST works.""" """Ensure token login view using JSON POST works."""