diff options
| author | Claude Paroz <claude@2xlibre.net> | 2017-01-07 12:11:46 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2017-01-18 21:33:28 +0100 |
| commit | 2b281cc35ed9d997614ca3c416928d7fabfef1ad (patch) | |
| tree | d3e73cf44b15139aa9f1f53e398942ba64f5e190 /tests/serializers | |
| parent | 7b2f2e74adb36a4334e83130f6abc2f79d395235 (diff) | |
Refs #23919 -- Removed most of remaining six usage
Thanks Tim Graham for the review.
Diffstat (limited to 'tests/serializers')
| -rw-r--r-- | tests/serializers/test_data.py | 3 | ||||
| -rw-r--r-- | tests/serializers/test_yaml.py | 2 | ||||
| -rw-r--r-- | tests/serializers/tests.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/tests/serializers/test_data.py b/tests/serializers/test_data.py index 2e9527f982..966df682b2 100644 --- a/tests/serializers/test_data.py +++ b/tests/serializers/test_data.py @@ -13,7 +13,6 @@ import uuid from django.core import serializers from django.db import connection, models from django.test import TestCase -from django.utils import six from .models import ( Anchor, AutoNowDateTimeData, BigIntegerData, BinaryData, BooleanData, @@ -197,7 +196,7 @@ uuid_obj = uuid.uuid4() test_data = [ # Format: (data type, PK value, Model Class, data) - (data_obj, 1, BinaryData, six.memoryview(b"\x05\xFD\x00")), + (data_obj, 1, BinaryData, memoryview(b"\x05\xFD\x00")), (data_obj, 2, BinaryData, None), (data_obj, 5, BooleanData, True), (data_obj, 6, BooleanData, False), diff --git a/tests/serializers/test_yaml.py b/tests/serializers/test_yaml.py index f3988d7ff1..542c28fb2e 100644 --- a/tests/serializers/test_yaml.py +++ b/tests/serializers/test_yaml.py @@ -1,10 +1,10 @@ import importlib import unittest +from io import StringIO from django.core import management, serializers from django.core.serializers.base import DeserializationError from django.test import SimpleTestCase, TestCase, TransactionTestCase -from django.utils.six import StringIO from .models import Author from .tests import SerializersTestBase, SerializersTransactionTestBase diff --git a/tests/serializers/tests.py b/tests/serializers/tests.py index 656bc4b4db..5c30d66082 100644 --- a/tests/serializers/tests.py +++ b/tests/serializers/tests.py @@ -1,4 +1,5 @@ from datetime import datetime +from io import StringIO from django.core import serializers from django.core.serializers import SerializerDoesNotExist @@ -10,7 +11,6 @@ from django.test import ( ) from django.test.utils import Approximate from django.utils.functional import curry -from django.utils.six import StringIO from .models import ( Actor, Article, Author, AuthorProfile, BaseModel, Category, ComplexModel, |
