From 396357741b88dfcd85486db673dbb822da8b2de0 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Tue, 7 Aug 2012 15:41:54 +0200 Subject: [py3] Used compatible imports of StringIO. --- tests/regressiontests/multiple_database/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/regressiontests/multiple_database/tests.py') diff --git a/tests/regressiontests/multiple_database/tests.py b/tests/regressiontests/multiple_database/tests.py index 595c5edb3b..08632fd4ce 100644 --- a/tests/regressiontests/multiple_database/tests.py +++ b/tests/regressiontests/multiple_database/tests.py @@ -2,7 +2,6 @@ from __future__ import absolute_import, unicode_literals import datetime import pickle -from StringIO import StringIO from django.conf import settings from django.contrib.auth.models import User @@ -11,6 +10,7 @@ from django.core import management from django.db import connections, router, DEFAULT_DB_ALIAS from django.db.models import signals from django.test import TestCase +from django.utils.six import StringIO from .models import Book, Person, Pet, Review, UserProfile -- cgit v1.3 From 0955d16a165e9da2f69813cc9983fd10dddbfa62 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 8 Aug 2012 07:50:59 -0700 Subject: Switched to using the standard method for comparing querysets in teh templates. --- tests/regressiontests/multiple_database/tests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/regressiontests/multiple_database/tests.py') diff --git a/tests/regressiontests/multiple_database/tests.py b/tests/regressiontests/multiple_database/tests.py index 08632fd4ce..74a5f2f550 100644 --- a/tests/regressiontests/multiple_database/tests.py +++ b/tests/regressiontests/multiple_database/tests.py @@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals import datetime import pickle +from operator import attrgetter from django.conf import settings from django.contrib.auth.models import User @@ -873,10 +874,10 @@ class QueryTestCase(TestCase): dive = Book.objects.using('other').create(title="Dive into Python", published=datetime.date(2009, 5, 4)) val = Book.objects.db_manager("other").raw('SELECT id FROM multiple_database_book') - self.assertEqual(map(lambda o: o.pk, val), [dive.pk]) + self.assertQuerysetEqual(val, [dive.pk], attrgetter("pk")) val = Book.objects.raw('SELECT id FROM multiple_database_book').using('other') - self.assertEqual(map(lambda o: o.pk, val), [dive.pk]) + self.assertQuerysetEqual(val, [dive.pk], attrgetter("pk")) def test_select_related(self): "Database assignment is retained if an object is retrieved with select_related()" -- cgit v1.3