From b5f0b3478dfcf0335f8ac2038d59f54b4a05f2a0 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Wed, 7 Dec 2016 17:42:31 -0500 Subject: Fixed #27579 -- Added aliases for Python 3's assertion names in SimpleTestCase. --- tests/m2m_regress/tests.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tests/m2m_regress') diff --git a/tests/m2m_regress/tests.py b/tests/m2m_regress/tests.py index 88b7ebb952..3c882c595a 100644 --- a/tests/m2m_regress/tests.py +++ b/tests/m2m_regress/tests.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from django.core.exceptions import FieldError from django.test import TestCase -from django.utils import six from .models import ( Entry, Line, Post, RegressionModelSplit, SelfRefer, SelfReferChild, @@ -37,10 +36,9 @@ class M2MRegressionTests(TestCase): def test_internal_related_name_not_in_error_msg(self): # The secret internal related names for self-referential many-to-many # fields shouldn't appear in the list when an error is made. - - six.assertRaisesRegex( - self, FieldError, - "Choices are: id, name, references, related, selfreferchild, selfreferchildsibling$", + self.assertRaisesMessage( + FieldError, + "Choices are: id, name, references, related, selfreferchild, selfreferchildsibling", lambda: SelfRefer.objects.filter(porcupine='fred') ) -- cgit v1.3