Made FieldError/FieldDoesNotExist messages uniform across Python versions.

Removed possible u'' prefixes on Python 2.

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py
index 28627e84ae..ad2f071fa4 100644
--- a/tests/annotations/tests.py
+++ b/tests/annotations/tests.py
@@ -237,7 +237,7 @@ class NonAggregateAnnotationTestCase(TestCase):
             self.assertEqual(book.sum_rating, book.rating)
 
     def test_filter_wrong_annotation(self):
-        with six.assertRaisesRegex(self, FieldError, "Cannot resolve keyword .*"):
+        with self.assertRaisesMessage(FieldError, "Cannot resolve keyword 'nope' into field."):
             list(Book.objects.annotate(
                 sum_rating=Sum('rating')
             ).filter(sum_rating=F('nope')))
@@ -307,7 +307,7 @@ class NonAggregateAnnotationTestCase(TestCase):
             self.assertEqual(book.rating, 5)
             self.assertEqual(book.other_rating, 4)
 
-        with six.assertRaisesRegex(self, FieldDoesNotExist, "\w has no field named u?'other_rating'"):
+        with self.assertRaisesMessage(FieldDoesNotExist, "Book has no field named 'other_rating'"):
             book = qs.defer('other_rating').get(other_rating=4)
 
     def test_mti_annotations(self):