diff --git a/gestioncof/decorators.py b/gestioncof/decorators.py index d7e70608..a1263ce3 100644 --- a/gestioncof/decorators.py +++ b/gestioncof/decorators.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -from django_cas_ng.decorators import user_passes_test +from django.contrib.auth.decorators import user_passes_test def is_cof(user): @@ -14,9 +10,7 @@ def is_cof(user): except: return False -cof_required = user_passes_test(lambda u: is_cof(u)) -cof_required_customdenied = user_passes_test(lambda u: is_cof(u), - login_url="cof-denied") +cof_required = user_passes_test(is_cof) def is_buro(user): @@ -26,4 +20,4 @@ def is_buro(user): except: return False -buro_required = user_passes_test(lambda u: is_buro(u)) +buro_required = user_passes_test(is_buro) diff --git a/kfet/decorators.py b/kfet/decorators.py index 9af9247f..0c8a1a76 100644 --- a/kfet/decorators.py +++ b/kfet/decorators.py @@ -1,12 +1,9 @@ # -*- coding: utf-8 -*- -from __future__ import (absolute_import, division, - print_function, unicode_literals) -from builtins import * +from django.contrib.auth.decorators import user_passes_test -from django_cas_ng.decorators import user_passes_test def kfet_is_team(user): return user.has_perm('kfet.is_team') -teamkfet_required = user_passes_test(lambda u: kfet_is_team(u)) +teamkfet_required = user_passes_test(kfet_is_team)