diff --git a/accounts/admin.py b/accounts/admin.py index c438f59..2f881f9 100644 --- a/accounts/admin.py +++ b/accounts/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin + from accounts.models import User diff --git a/accounts/models.py b/accounts/models.py index e7d4fb5..a2a0833 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -1,6 +1,6 @@ -from django.db import models from django.contrib.auth.models import AbstractUser +from django.db import models class User(AbstractUser): - uuid = models.UUIDField(editable=False, default="00000000000000000000000000000000") + uuid = models.UUIDField(editable=False, default='00000000000000000000000000000000') diff --git a/accounts/settings.py b/accounts/settings.py index 138d6ab..5e680ab 100644 --- a/accounts/settings.py +++ b/accounts/settings.py @@ -1,7 +1,9 @@ import os + from django.conf import settings -USER_SETTINGS = getattr(settings, "PLATFORM_ACCOUNTS", {}) + +USER_SETTINGS = getattr(settings, 'PLATFORM_ACCOUNTS', {}) DEFAULTS = { 'CLIENT_ID': os.environ.get('LABS_CLIENT_ID'), @@ -22,7 +24,7 @@ def __init__(self, settings=None, defaults=None): def __getattr__(self, attr): if attr not in self.defaults.keys(): - raise AttributeError("Invalid Penn Labs accounts setting: %s" % attr) + raise AttributeError('Invalid Penn Labs accounts setting: %s' % attr) try: val = self.settings[attr] diff --git a/accounts/urls.py b/accounts/urls.py index b9718a6..8f953ca 100644 --- a/accounts/urls.py +++ b/accounts/urls.py @@ -1,4 +1,5 @@ from django.urls import path + from accounts.views import CallbackView, LoginView diff --git a/accounts/views.py b/accounts/views.py index 7a56f52..9025e0a 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -1,9 +1,10 @@ -from requests_oauthlib import OAuth2Session from django.contrib import auth from django.http import HttpResponseServerError from django.http.response import HttpResponseBadRequest from django.shortcuts import redirect from django.views import View +from requests_oauthlib import OAuth2Session + from accounts.settings import accounts_settings @@ -11,7 +12,7 @@ class LoginView(View): def get(self, request): return_to = request.GET.get('next') if not return_to: - return HttpResponseBadRequest("Invalid next parameter") + return HttpResponseBadRequest('Invalid next parameter') request.session.__setitem__('next', return_to) if not request.user.is_authenticated: platform = OAuth2Session( diff --git a/runtests.py b/runtests.py index f9be171..6d70827 100755 --- a/runtests.py +++ b/runtests.py @@ -1,7 +1,9 @@ import sys + import django from xmlrunner.extra.djangotestrunner import XMLTestRunner + django.setup() test_runner = XMLTestRunner(verbosity=2) diff --git a/tests/test_apps.py b/tests/test_apps.py index 06d639b..06dc600 100644 --- a/tests/test_apps.py +++ b/tests/test_apps.py @@ -1,4 +1,5 @@ from django.test import TestCase + from accounts.apps import AccountsConfig diff --git a/tests/test_backends.py b/tests/test_backends.py index d18d524..a2f6431 100644 --- a/tests/test_backends.py +++ b/tests/test_backends.py @@ -1,6 +1,6 @@ -from django.test import TestCase from django.contrib import auth from django.contrib.auth import get_user_model +from django.test import TestCase class BackendTestCase(TestCase): diff --git a/tests/test_settings.py b/tests/test_settings.py index fd0e241..047b046 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -1,6 +1,7 @@ from django.test import TestCase from tests.settings import PLATFORM_ACCOUNTS -from accounts.settings import accounts_settings, DEFAULTS + +from accounts.settings import DEFAULTS, accounts_settings class SettingsTestCase(TestCase): diff --git a/tests/test_views.py b/tests/test_views.py index 880c1f8..cf9988f 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -1,8 +1,10 @@ -from unittest.mock import patch import urllib.parse -from django.test import TestCase, Client -from django.urls import reverse +from unittest.mock import patch + from django.contrib.auth import get_user_model +from django.test import Client, TestCase +from django.urls import reverse + from accounts.settings import accounts_settings diff --git a/tests/urls.py b/tests/urls.py index 65b6d06..67fb02d 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -1,2 +1,4 @@ -from django.urls import path, include +from django.urls import include, path + + urlpatterns = [path('accounts/', include('accounts.urls', namespace='accounts'))]