innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.4.x] -- Fixed Python 2.5 compatibility issues

This commit is contained in:
Anssi Kääriäinen 2012-09-30 16:36:01 +03:00
parent 1f537335d9
commit 4dba4ed548
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/filters.py
View File

@ -131,7 +131,7 @@ class FieldListFilter(ListFilter):
def queryset(self, request, queryset): def queryset(self, request, queryset):
try: try:
return queryset.filter(**self.used_parameters) return queryset.filter(**self.used_parameters)
except ValidationError as e: except ValidationError, e:
raise IncorrectLookupParameters(e) raise IncorrectLookupParameters(e)
@classmethod @classmethod

6
django/contrib/auth/tests/context_processors.py
View File

@ -43,13 +43,15 @@ class PermWrapperTests(TestCase):
Test that 'something' in PermWrapper doesn't end up in endless loop. Test that 'something' in PermWrapper doesn't end up in endless loop.
""" """
perms = PermWrapper(MockUser()) perms = PermWrapper(MockUser())
with self.assertRaises(TypeError): def raises():
self.EQLimiterObject() in perms self.EQLimiterObject() in perms
self.assertRaises(raises, TypeError)
def test_permlookupdict_in(self): def test_permlookupdict_in(self):
pldict = PermLookupDict(MockUser(), 'mockapp') pldict = PermLookupDict(MockUser(), 'mockapp')
with self.assertRaises(TypeError): def raises():
self.EQLimiterObject() in pldict self.EQLimiterObject() in pldict
self.assertRaises(raises, TypeError)
class AuthContextProcessorTests(TestCase): class AuthContextProcessorTests(TestCase):