From a698c69b4d473d32189622d1cc8a336d6662b1fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Bru=CC=88ggemann?= <mail@thomasbrueggemann.com>
Date: Sun, 8 Jan 2017 20:33:33 +0100
Subject: [PATCH] Fix pep8 style
---
src/documents/mixins.py | 67 ++++++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 31 deletions(-)
diff --git a/src/documents/mixins.py b/src/documents/mixins.py
index 740f9f232..d17275908 100644
--- a/src/documents/mixins.py
+++ b/src/documents/mixins.py
@@ -2,6 +2,7 @@ from django.contrib.auth.mixins import AccessMixin
from django.contrib.auth import authenticate, login
import base64
+
class Renderable(object):
"""
A handy mixin to make it easier/cleaner to print output based on a
@@ -12,41 +13,45 @@ class Renderable(object):
if self.verbosity >= verbosity:
print(text)
+
class SessionOrBasicAuthMixin(AccessMixin):
- """
- Session or Basic Authentication mixin for Django.
- It determines if the requester is already logged in or if they have provided
- proper http-authorization and returning the view if all goes well, otherwise
- responding with a 401.
+ """
+ Session or Basic Authentication mixin for Django.
+ It determines if the requester is already logged in or if they have
+ provided proper http-authorization and returning the view if all goes
+ well, otherwise responding with a 401.
- Base for mixin found here: https://djangosnippets.org/snippets/3073/
- """
+ Base for mixin found here: https://djangosnippets.org/snippets/3073/
+ """
- def dispatch(self, request, *args, **kwargs):
+ def dispatch(self, request, *args, **kwargs):
- # check if user is authenticated via the session
- if request.user.is_authenticated:
+ # check if user is authenticated via the session
+ if request.user.is_authenticated:
- # Already logged in, just return the view.
- return super(SessionOrBasicAuthMixin, self).dispatch(
- request, *args, **kwargs
- )
+ # Already logged in, just return the view.
+ return super(SessionOrBasicAuthMixin, self).dispatch(
+ request, *args, **kwargs
+ )
- # apparently not authenticated via session, maybe via HTTP Basic?
- if 'HTTP_AUTHORIZATION' in request.META:
- auth = request.META['HTTP_AUTHORIZATION'].split()
- if len(auth) == 2:
- # NOTE: Support for only basic authentication
- if auth[0].lower() == "basic":
- uname, passwd = base64.b64decode(auth[1]).decode('utf-8').split(':')
- user = authenticate(username=uname, password=passwd)
- if user is not None:
- if user.is_active:
- login(request, user)
- request.user = user
- return super(SessionOrBasicAuthMixin, self).dispatch(
- request, *args, **kwargs
- )
+ # apparently not authenticated via session, maybe via HTTP Basic?
+ if 'HTTP_AUTHORIZATION' in request.META:
+ auth = request.META['HTTP_AUTHORIZATION'].split()
+ if len(auth) == 2:
+ # NOTE: Support for only basic authentication
+ if auth[0].lower() == "basic":
+ authString = base64.b64decode(auth[1]).decode('utf-8')
+ uname, passwd = authString.split(':')
+ user = authenticate(username=uname, password=passwd)
+ if user is not None:
+ if user.is_active:
+ login(request, user)
+ request.user = user
+ return super(
+ SessionOrBasicAuthMixin, self
+ ).dispatch(
+ request, *args, **kwargs
+ )
- # nope, really not authenticated
- return self.handle_no_permission()
+ # nope, really not authenticated
+ return self.handle_no_permission()