summaryrefslogtreecommitdiff
path: root/tests/model_fields
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-01-07 12:11:46 +0100
committerClaude Paroz <claude@2xlibre.net>2017-01-18 21:33:28 +0100
commit2b281cc35ed9d997614ca3c416928d7fabfef1ad (patch)
treed3e73cf44b15139aa9f1f53e398942ba64f5e190 /tests/model_fields
parent7b2f2e74adb36a4334e83130f6abc2f79d395235 (diff)
Refs #23919 -- Removed most of remaining six usage
Thanks Tim Graham for the review.
Diffstat (limited to 'tests/model_fields')
-rw-r--r--tests/model_fields/models.py3
-rw-r--r--tests/model_fields/test_binaryfield.py3
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/model_fields/models.py b/tests/model_fields/models.py
index 019301d5e2..4830fb9ed2 100644
--- a/tests/model_fields/models.py
+++ b/tests/model_fields/models.py
@@ -12,7 +12,6 @@ from django.db.models.fields.files import ImageField, ImageFieldFile
from django.db.models.fields.related import (
ForeignKey, ForeignObject, ManyToManyField, OneToOneField,
)
-from django.utils import six
try:
from PIL import Image
@@ -51,7 +50,7 @@ class Whiz(models.Model):
c = models.IntegerField(choices=CHOICES, null=True)
-class Counter(six.Iterator):
+class Counter:
def __init__(self):
self.n = 1
diff --git a/tests/model_fields/test_binaryfield.py b/tests/model_fields/test_binaryfield.py
index 641dc17287..9d97d1118f 100644
--- a/tests/model_fields/test_binaryfield.py
+++ b/tests/model_fields/test_binaryfield.py
@@ -1,6 +1,5 @@
from django.core.exceptions import ValidationError
from django.test import TestCase
-from django.utils import six
from .models import DataModel
@@ -9,7 +8,7 @@ class BinaryFieldTests(TestCase):
binary_data = b'\x00\x46\xFE'
def test_set_and_retrieve(self):
- data_set = (self.binary_data, six.memoryview(self.binary_data))
+ data_set = (self.binary_data, memoryview(self.binary_data))
for bdata in data_set:
dm = DataModel(data=bdata)
dm.save()