From 3e318d0dcfcf7de07e3dabb1c17dd4dc78a72495 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 27 Sep 2016 10:25:20 +0200 Subject: [PATCH] Django 1.10: User.is_authenticated is now a property --- src/pretix/base/middleware.py | 4 ++-- src/pretix/control/middleware.py | 2 +- src/pretix/control/permissions.py | 4 ++-- src/pretix/control/views/auth.py | 8 ++++---- src/pretix/presale/utils.py | 2 +- src/pretix/presale/views/locale.py | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pretix/base/middleware.py b/src/pretix/base/middleware.py index 3769f71602..654a256058 100644 --- a/src/pretix/base/middleware.py +++ b/src/pretix/base/middleware.py @@ -43,7 +43,7 @@ class LocaleMiddleware(MiddlewareMixin): request.LANGUAGE_CODE = translation.get_language() tzname = None - if request.user.is_authenticated(): + if request.user.is_authenticated: tzname = request.user.timezone if hasattr(request, 'event'): tzname = request.event.settings.timezone @@ -65,7 +65,7 @@ class LocaleMiddleware(MiddlewareMixin): def get_language_from_user_settings(request: HttpRequest) -> str: - if request.user.is_authenticated(): + if request.user.is_authenticated: lang_code = request.user.locale if lang_code in _supported and lang_code is not None and check_for_language(lang_code): return lang_code diff --git a/src/pretix/control/middleware.py b/src/pretix/control/middleware.py index 041f584b17..b8906de7e9 100644 --- a/src/pretix/control/middleware.py +++ b/src/pretix/control/middleware.py @@ -37,7 +37,7 @@ class PermissionMiddleware(MiddlewareMixin): return redirect(urljoin(settings.SITE_URL, request.get_full_path())) if url_name in self.EXCEPTIONS: return - if not request.user.is_authenticated(): + if not request.user.is_authenticated: # Taken from django/contrib/auth/decorators.py path = request.build_absolute_uri() # urlparse chokes on lazy objects in Python 3, force to str diff --git a/src/pretix/control/permissions.py b/src/pretix/control/permissions.py index a38d3ffa94..ef5708063e 100644 --- a/src/pretix/control/permissions.py +++ b/src/pretix/control/permissions.py @@ -11,7 +11,7 @@ def event_permission_required(permission): """ def decorator(function): def wrapper(request, *args, **kw): - if not request.user.is_authenticated(): # NOQA + if not request.user.is_authenticated: # NOQA # just a double check, should not ever happen raise PermissionDenied() try: @@ -55,7 +55,7 @@ def organizer_permission_required(permission): """ def decorator(function): def wrapper(request, *args, **kw): - if not request.user.is_authenticated(): # NOQA + if not request.user.is_authenticated: # NOQA # just a double check, should not ever happen raise PermissionDenied() try: diff --git a/src/pretix/control/views/auth.py b/src/pretix/control/views/auth.py index ceecc3ef9f..78da5d53a3 100644 --- a/src/pretix/control/views/auth.py +++ b/src/pretix/control/views/auth.py @@ -24,7 +24,7 @@ def login(request): parameter "next" for redirection after successful login """ ctx = {} - if request.user.is_authenticated(): + if request.user.is_authenticated: return redirect(request.GET.get("next", 'control:index')) if request.method == 'POST': form = LoginForm(data=request.POST) @@ -56,7 +56,7 @@ def register(request): if not settings.PRETIX_REGISTRATION: raise PermissionDenied('Registration is disabled') ctx = {} - if request.user.is_authenticated(): + if request.user.is_authenticated: return redirect(request.GET.get("next", 'control:index')) if request.method == 'POST': form = RegistrationForm(data=request.POST) @@ -85,7 +85,7 @@ class Forgot(TemplateView): return super().dispatch(request, *args, **kwargs) def get(self, request, *args, **kwargs): - if request.user.is_authenticated(): + if request.user.is_authenticated: return redirect(request.GET.get("next", 'control:index')) return super().get(request, *args, **kwargs) @@ -149,7 +149,7 @@ class Recover(TemplateView): return super().dispatch(request, *args, **kwargs) def get(self, request, *args, **kwargs): - if request.user.is_authenticated(): + if request.user.is_authenticated: return redirect(request.GET.get("next", 'control:index')) try: user = User.objects.get(id=self.request.GET.get('id')) diff --git a/src/pretix/presale/utils.py b/src/pretix/presale/utils.py index 8834d17566..8fb5e16e08 100644 --- a/src/pretix/presale/utils.py +++ b/src/pretix/presale/utils.py @@ -60,7 +60,7 @@ def _detect_event(request): LocaleMiddleware().process_request(request) if not request.event.live: - if not request.user.is_authenticated() or not EventPermission.objects.filter( + if not request.user.is_authenticated or not EventPermission.objects.filter( event=request.event, user=request.user).exists(): raise PermissionDenied(_('The selected ticket shop is currently not available.')) diff --git a/src/pretix/presale/views/locale.py b/src/pretix/presale/views/locale.py index cbdde65efd..7a605837ce 100644 --- a/src/pretix/presale/views/locale.py +++ b/src/pretix/presale/views/locale.py @@ -15,7 +15,7 @@ class LocaleSet(View): locale = request.GET.get('locale') if locale in [lc for lc, ll in settings.LANGUAGES]: - if request.user.is_authenticated(): + if request.user.is_authenticated: request.user.locale = locale request.user.save()