Commit 39635774 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

[py3] Used compatible imports of StringIO.

parent 2da3af23

tests/modeltests/fixtures/tests.py

+4 −5
Original line number Diff line number Diff line 
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)

tests/modeltests/serializers/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -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,

tests/modeltests/user_commands/tests.py

+1 −1
Original line number Diff line number Diff line 
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):

tests/regressiontests/bash_completion/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ A series of tests to establish that the command-line bash completion works. 
"""

import os

import sys

import StringIO



from django.conf import settings

from django.core.management import ManagementUtility

from django.utils import unittest

from django.utils.six import StringIO





class BashCompletionTests(unittest.TestCase):
@@ -20,7 +20,7 @@ class BashCompletionTests(unittest.TestCase): 
    def setUp(self):

        self.old_DJANGO_AUTO_COMPLETE = os.environ.get('DJANGO_AUTO_COMPLETE')

        os.environ['DJANGO_AUTO_COMPLETE'] = '1'

        self.output = StringIO.StringIO()

        self.output = StringIO()

        self.old_stdout = sys.stdout

        sys.stdout = self.output

tests/regressiontests/builtin_server/tests.py

+1 −2
Original line number Diff line number Diff line 
from StringIO import StringIO



from django.core.servers.basehttp import ServerHandler

from django.utils.six import StringIO

from django.utils.unittest import TestCase



#