diff --git a/django/contrib/admin/filters.py b/django/contrib/admin/filters.py index 549c15934b..6a97fb5c0b 100644 --- a/django/contrib/admin/filters.py +++ b/django/contrib/admin/filters.py @@ -131,7 +131,7 @@ class FieldListFilter(ListFilter): def queryset(self, request, queryset): try: return queryset.filter(**self.used_parameters) - except ValidationError as e: + except ValidationError, e: raise IncorrectLookupParameters(e) @classmethod diff --git a/django/contrib/auth/tests/context_processors.py b/django/contrib/auth/tests/context_processors.py index 55cbdd413e..d387ffc8b2 100644 --- a/django/contrib/auth/tests/context_processors.py +++ b/django/contrib/auth/tests/context_processors.py @@ -43,13 +43,15 @@ class PermWrapperTests(TestCase): Test that 'something' in PermWrapper doesn't end up in endless loop. """ perms = PermWrapper(MockUser()) - with self.assertRaises(TypeError): + def raises(): self.EQLimiterObject() in perms + self.assertRaises(raises, TypeError) def test_permlookupdict_in(self): pldict = PermLookupDict(MockUser(), 'mockapp') - with self.assertRaises(TypeError): + def raises(): self.EQLimiterObject() in pldict + self.assertRaises(raises, TypeError) class AuthContextProcessorTests(TestCase):