summaryrefslogtreecommitdiff
path: root/tests/managers_regress
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-01-24 12:22:42 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-24 18:45:54 +0100
commit2366100872ec17dde06abc63c1ad74dcf746b134 (patch)
treed6b5c393f8c2c2d01bcbb2295759f14bbf3aac05 /tests/managers_regress
parent5b95d421f7ab8deadaf3c1ad3f341bdfc85bfca4 (diff)
downloaddjango-2366100872ec17dde06abc63c1ad74dcf746b134.tar.gz
Removed unneeded force_text calls in the test suite
Diffstat (limited to 'tests/managers_regress')
-rw-r--r--tests/managers_regress/models.py5
-rw-r--r--tests/managers_regress/tests.py3
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/managers_regress/models.py b/tests/managers_regress/models.py
index f5fd648bff..1c274d8704 100644
--- a/tests/managers_regress/models.py
+++ b/tests/managers_regress/models.py
@@ -7,7 +7,6 @@ from django.contrib.contenttypes.fields import (
)
from django.contrib.contenttypes.models import ContentType
from django.db import models
-from django.utils.encoding import force_text
class OnlyFred(models.Manager):
@@ -123,7 +122,7 @@ class RelatedModel(models.Model):
exact = models.NullBooleanField()
def __str__(self):
- return force_text(self.pk)
+ return str(self.pk)
class RelationModel(models.Model):
@@ -136,4 +135,4 @@ class RelationModel(models.Model):
gfk = GenericForeignKey(ct_field='gfk_ctype', fk_field='gfk_id')
def __str__(self):
- return force_text(self.pk)
+ return str(self.pk)
diff --git a/tests/managers_regress/tests.py b/tests/managers_regress/tests.py
index 1b3e0a1635..a05a24e597 100644
--- a/tests/managers_regress/tests.py
+++ b/tests/managers_regress/tests.py
@@ -2,7 +2,6 @@ from django.db import models
from django.template import Context, Template
from django.test import TestCase, override_settings
from django.test.utils import isolate_apps
-from django.utils.encoding import force_text
from .models import (
AbstractBase1, AbstractBase2, AbstractBase3, Child1, Child2, Child3,
@@ -148,7 +147,7 @@ class ManagersRegressionTests(TestCase):
self.assertEqual(
t.render(Context({'related': related})),
- ''.join([force_text(relation.pk)] * 3),
+ ''.join([str(relation.pk)] * 3),
)
def test_field_can_be_called_exact(self):