summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelle van der Waa <jelle@vdwaa.nl>2018-10-20 19:05:26 +0200
committerJelle van der Waa <jelle@vdwaa.nl>2018-11-17 15:30:58 +0100
commit49bec38981f77e99f07fa5a38c4245853a162b25 (patch)
treeabf3095921f5677652106df78b8845271a090bca
parent6bd14ee0c9c0811f4edd72333e0f4920e7ed0fbc (diff)
downloadarchweb-49bec38981f77e99f07fa5a38c4245853a162b25.tar.gz
archweb-49bec38981f77e99f07fa5a38c4245853a162b25.zip
Using user.is_authenticated() as a method is deprecated
Use is_authenticated as an attribute.
-rw-r--r--devel/views.py2
-rw-r--r--mirrors/views/__init__.py6
-rw-r--r--mirrors/views/api.py2
-rw-r--r--packages/views/flag.py2
-rw-r--r--packages/views/search.py8
5 files changed, 10 insertions, 10 deletions
diff --git a/devel/views.py b/devel/views.py
index d990ae1d..89720646 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -33,7 +33,7 @@ from .utils import get_annotated_maintainers
@login_required
def index(request):
"""The developer dashboard."""
- if request.user.is_authenticated():
+ if request.user.is_authenticated:
inner_q = PackageRelation.objects.filter(user=request.user)
else:
inner_q = PackageRelation.objects.none()
diff --git a/mirrors/views/__init__.py b/mirrors/views/__init__.py
index d7a45824..831bbf0b 100644
--- a/mirrors/views/__init__.py
+++ b/mirrors/views/__init__.py
@@ -28,7 +28,7 @@ def mirrors(request, tier=None):
'mirror_id', 'country').order_by(
'mirror_id', 'country').distinct()
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
mirror_list = mirror_list.filter(public=True, active=True)
protos = protos.filter(
mirror__public=True, mirror__active=True, active=True)
@@ -52,7 +52,7 @@ def mirrors(request, tier=None):
def mirror_details(request, name):
mirror = get_object_or_404(Mirror, name=name)
- authorized = request.user.is_authenticated()
+ authorized = request.user.is_authenticated
if not authorized and \
(not mirror.public or not mirror.active):
raise Http404
@@ -90,7 +90,7 @@ def url_details(request, name, url_id):
url = get_object_or_404(MirrorUrl.objects.select_related(),
id=url_id, mirror__name=name)
mirror = url.mirror
- authorized = request.user.is_authenticated()
+ authorized = request.user.is_authenticated
if not authorized and \
(not mirror.public or not mirror.active or not url.active):
raise Http404
diff --git a/mirrors/views/api.py b/mirrors/views/api.py
index 33967191..857b1d1d 100644
--- a/mirrors/views/api.py
+++ b/mirrors/views/api.py
@@ -87,7 +87,7 @@ def status_json(request, tier=None):
def mirror_details_json(request, name):
- authorized = request.user.is_authenticated()
+ authorized = request.user.is_authenticated
mirror = get_object_or_404(Mirror, name=name)
if not authorized and (not mirror.public or not mirror.active):
raise Http404
diff --git a/packages/views/flag.py b/packages/views/flag.py
index 172de24f..62478d38 100644
--- a/packages/views/flag.py
+++ b/packages/views/flag.py
@@ -61,7 +61,7 @@ def flag(request, name, repo, arch):
repo__staging=pkg.repo.staging).order_by(
'pkgname', 'repo__name', 'arch__name')
- authenticated = request.user.is_authenticated()
+ authenticated = request.user.is_authenticated
if request.POST:
form = FlagForm(request.POST, authenticated=authenticated)
diff --git a/packages/views/search.py b/packages/views/search.py
index ffb8f23b..f4f12b9a 100644
--- a/packages/views/search.py
+++ b/packages/views/search.py
@@ -120,12 +120,12 @@ class SearchListView(ListView):
if request.method == 'HEAD':
return empty_response()
self.form = PackageSearchForm(data=request.GET,
- show_staging=self.request.user.is_authenticated())
+ show_staging=self.request.user.is_authenticated)
return super(SearchListView, self).get(request, *args, **kwargs)
def get_queryset(self):
packages = Package.objects.normal()
- if not self.request.user.is_authenticated():
+ if not self.request.user.is_authenticated:
packages = packages.filter(repo__staging=False)
if self.form.is_valid():
packages = parse_form(self.form, packages)
@@ -160,7 +160,7 @@ def search_json(request):
if request.GET:
form = PackageSearchForm(data=request.GET,
- show_staging=request.user.is_authenticated())
+ show_staging=request.user.is_authenticated)
if form.is_valid():
form_limit = form.cleaned_data['limit']
limit = min(limit, int(form_limit)) if form_limit else limit
@@ -168,7 +168,7 @@ def search_json(request):
packages = Package.objects.select_related('arch', 'repo',
'packager')
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
packages = packages.filter(repo__staging=False)
packages = parse_form(form, packages)