diff options
Diffstat (limited to 'tests/modeltests')
| -rw-r--r-- | tests/modeltests/fixtures/tests.py | 9 | ||||
| -rw-r--r-- | tests/modeltests/serializers/tests.py | 2 | ||||
| -rw-r--r-- | tests/modeltests/user_commands/tests.py | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/tests/modeltests/fixtures/tests.py b/tests/modeltests/fixtures/tests.py index 1efa035e8a..b332348425 100644 --- a/tests/modeltests/fixtures/tests.py +++ b/tests/modeltests/fixtures/tests.py @@ -1,11 +1,10 @@ from __future__ import absolute_import -import StringIO - from django.contrib.sites.models import Site from django.core import management from django.db import connection, IntegrityError from django.test import TestCase, TransactionTestCase, skipUnlessDBFeature +from django.utils.six import StringIO from .models import Article, Book, Spy, Tag, Visa @@ -26,7 +25,7 @@ class FixtureLoadingTests(TestCase): def _dumpdata_assert(self, args, output, format='json', natural_keys=False, use_base_manager=False, exclude_list=[]): - new_io = StringIO.StringIO() + new_io = StringIO() management.call_command('dumpdata', *args, **{'format':format, 'stdout':new_io, 'stderr':new_io, @@ -43,7 +42,7 @@ class FixtureLoadingTests(TestCase): ]) def test_loading_and_dumping(self): - new_io = StringIO.StringIO() + new_io = StringIO() Site.objects.all().delete() # Load fixture 1. Single JSON file, with two objects. @@ -293,7 +292,7 @@ class FixtureLoadingTests(TestCase): class FixtureTransactionTests(TransactionTestCase): def _dumpdata_assert(self, args, output, format='json'): - new_io = StringIO.StringIO() + new_io = StringIO() management.call_command('dumpdata', *args, **{'format':format, 'stdout':new_io}) command_output = new_io.getvalue().strip() self.assertEqual(command_output, output) diff --git a/tests/modeltests/serializers/tests.py b/tests/modeltests/serializers/tests.py index 9177227539..ec3cc132db 100644 --- a/tests/modeltests/serializers/tests.py +++ b/tests/modeltests/serializers/tests.py @@ -4,13 +4,13 @@ from __future__ import absolute_import, unicode_literals import json from datetime import datetime from xml.dom import minidom -from StringIO import StringIO from django.conf import settings from django.core import serializers from django.db import transaction, connection from django.test import TestCase, TransactionTestCase, Approximate from django.utils import six +from django.utils.six import StringIO from django.utils import unittest from .models import (Category, Author, Article, AuthorProfile, Actor, Movie, diff --git a/tests/modeltests/user_commands/tests.py b/tests/modeltests/user_commands/tests.py index 509f13f62f..d25911c09f 100644 --- a/tests/modeltests/user_commands/tests.py +++ b/tests/modeltests/user_commands/tests.py @@ -1,10 +1,10 @@ import sys -from StringIO import StringIO from django.core import management from django.core.management.base import CommandError from django.test import TestCase from django.utils import translation +from django.utils.six import StringIO class CommandTests(TestCase): |
