diff options
| author | Tymur Maryokhin | 2014-12-04 02:50:25 +0100 | 
|---|---|---|
| committer | Tymur Maryokhin | 2014-12-04 02:50:25 +0100 | 
| commit | 09e59f268619927dc22f15fed97c3ceac05ea306 (patch) | |
| tree | c49f1adee6a631ea9abacc1425d5d92bdbec2da8 /tests | |
| parent | f8fdfe5a9379bd72066f7ac3a05198271a74088a (diff) | |
| download | django-rest-framework-09e59f268619927dc22f15fed97c3ceac05ea306.tar.bz2 | |
Removed custom python_2_unicode_compatible. Closes #2183
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_description.py | 5 | ||||
| -rw-r--r-- | tests/test_relations_generic.py | 2 | 
2 files changed, 3 insertions, 4 deletions
| diff --git a/tests/test_description.py b/tests/test_description.py index 0675d209..6cd871ed 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -2,6 +2,7 @@  from __future__ import unicode_literals  from django.test import TestCase +from django.utils.encoding import python_2_unicode_compatible  from rest_framework.compat import apply_markdown, smart_text  from rest_framework.views import APIView  from .description import ViewWithNonASCIICharactersInDocstring @@ -107,6 +108,7 @@ class TestViewNamesAndDescriptions(TestCase):          """          # use a mock object instead of gettext_lazy to ensure that we can't end          # up with a test case string in our l10n catalog +        @python_2_unicode_compatible          class MockLazyStr(object):              def __init__(self, string):                  self.s = string @@ -114,9 +116,6 @@ class TestViewNamesAndDescriptions(TestCase):              def __str__(self):                  return self.s -            def __unicode__(self): -                return self.s -          class MockView(APIView):              __doc__ = MockLazyStr("a gettext string") diff --git a/tests/test_relations_generic.py b/tests/test_relations_generic.py index 380ad91d..b600b333 100644 --- a/tests/test_relations_generic.py +++ b/tests/test_relations_generic.py @@ -3,8 +3,8 @@ from django.contrib.contenttypes.models import ContentType  from django.contrib.contenttypes.generic import GenericRelation, GenericForeignKey  from django.db import models  from django.test import TestCase +from django.utils.encoding import python_2_unicode_compatible  from rest_framework import serializers -from rest_framework.compat import python_2_unicode_compatible  @python_2_unicode_compatible | 
