Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-03-16 22:20:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #417 from montiniz/py3-fix

Browse source 
Raise syntax no longer accepts comma-separated arguments in python3
This commit is contained in:
Kamil Gałuszka 2015-03-30 22:53:44 +02:00
commit d69729e52f
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
djadmin2/tests/test_types.py
View file

@ -65,3 +65,21 @@ class ModelAdminTest(TestCase):
'paginate_by',
admin_instance.get_index_kwargs().keys()
)
def test_get_urls(self):
admin_instance = ModelAdmin2(BigThing, Admin2)
self.assertEqual(6, len(admin_instance.get_urls()))
def test_get_urls_throws_type_error(self):
with self.assertRaises(TypeError):
try:
admin_instance = ModelAdmin2(BigThing, Admin2)
admin_instance.views = [views.AdminView(None, None, None)]
admin_instance.get_urls()
except TypeError as e:
message = u"Cannot instantiate admin view " \
'"ModelAdmin2.None". The error that got raised was: ' \
"'NoneType' object has no attribute 'as_view'"
self.assertEqual(e.args[0], message)
raise

6
djadmin2/types.py
View file

@ -224,7 +224,11 @@ class ModelAdmin2(with_metaclass(ModelAdminBase2)):
'Cannot instantiate admin view "{}.{}". '
'The error that got raised was: {}'.format(
self.__class__.__name__, admin_view.name, e))
raise (new_exception, None, trace)
try:
raise new_exception.with_traceback(trace)
except AttributeError:
raise (new_exception, None, trace)
pattern_list.append(
url(
regex=admin_view.url,