diff --git a/biscuit/core/decorators.py b/biscuit/core/decorators.py index bf269cc59c8608ebc93e6c3cb4f9d077db4f27e2..a30f4b90eb87b74c39cafd09422785964535b059 100644 --- a/biscuit/core/decorators.py +++ b/biscuit/core/decorators.py @@ -12,5 +12,6 @@ def teacher_required(function=None): def admin_required(function=None): - actual_decorator = user_passes_test(lambda u: u.is_active and u.is_superuser) + actual_decorator = user_passes_test( + lambda u: u.is_active and u.is_superuser) return actual_decorator(function) diff --git a/biscuit/core/settings.py b/biscuit/core/settings.py index a05e9689adce04946196c5486c55b537408cf164..43c0cf838ca63d3b358baf2ff35ff6ed0432b9b6 100644 --- a/biscuit/core/settings.py +++ b/biscuit/core/settings.py @@ -125,7 +125,8 @@ LOGOUT_REDIRECT_URL = 'index' STATIC_ROOT = LocalSetting() MEDIA_ROOT = LocalSetting() -FONT_AWESOME = {'url': LocalSetting(default="/javascript/font-awesome/css/font-awesome.min.css")} +FONT_AWESOME = {'url': LocalSetting( + default="/javascript/font-awesome/css/font-awesome.min.css")} BOOTSTRAP4 = { "css_url": LocalSetting(default="/javascript/bootstrap4/css/bootstrap.min.css"), @@ -136,10 +137,10 @@ BOOTSTRAP4 = { } ANY_JS = { - 'DataTables': { - 'css_url': LocalSetting(default="/javascript/jquery-datatables/css/dataTables.bootstrap4.min.css"), - 'js_url': LocalSetting("/javascript/jquery-datatables/dataTables.bootstrap4.min.js") - } + 'DataTables': { + 'css_url': LocalSetting(default="/javascript/jquery-datatables/css/dataTables.bootstrap4.min.css"), + 'js_url': LocalSetting("/javascript/jquery-datatables/dataTables.bootstrap4.min.js") + } } diff --git a/biscuit/core/urls.py b/biscuit/core/urls.py index 1f2ba76da1b3ecb32a9be4ffed74c867dc62b4d4..885f72bcc499776c6af2897b4e2f849d23b94e35 100644 --- a/biscuit/core/urls.py +++ b/biscuit/core/urls.py @@ -14,11 +14,13 @@ urlpatterns = [ # Serve javascript-common if in development if settings.DEBUG: - urlpatterns += static('/javascript/', document_root='/usr/share/javascript/') + urlpatterns += static('/javascript/', + document_root='/usr/share/javascript/') # Automatically mount URLs from all installed BiscuIT apps for app_config in apps.app_configs.values(): if not app_config.name.startswith('biscuit.apps.'): continue - urlpatterns.append(path('app/%s/' % app_config.label, include('%s.urls' % app_config.name))) + urlpatterns.append(path('app/%s/' % app_config.label, + include('%s.urls' % app_config.name))) diff --git a/biscuit/core/util.py b/biscuit/core/util.py index 1364a675fb4d1a60984c1ac3cde15402b2874202..9db155913aa991a5487e3e8c7b81ce9ddf5eeb22 100644 --- a/biscuit/core/util.py +++ b/biscuit/core/util.py @@ -1,6 +1,7 @@ import pkgutil from typing import Sequence + def get_app_packages() -> Sequence: """ Find all packages within the biscuit.apps namespace. """ @@ -10,6 +11,7 @@ def get_app_packages() -> Sequence: except ImportError: return [] - pkgs = ['biscuit.apps.%s' % i[1] for i in pkgutil.iter_modules(biscuit.apps.__path__)] + pkgs = ['biscuit.apps.%s' % i[1] + for i in pkgutil.iter_modules(biscuit.apps.__path__)] return pkgs diff --git a/setup.py b/setup.py index 1fcff0cff88c19de07978bec26c2c4ca9dae8fb9..3c334f5b5ebe965918ed25e7331f9eb9322afa1f 100755 --- a/setup.py +++ b/setup.py @@ -9,27 +9,27 @@ setup( author="Teckids e.V.", author_email="verein@teckids.org", packages=[ - 'biscuit.core' - ], + 'biscuit.core' + ], namespace_packages=[ - 'biscuit', - ], + 'biscuit', + ], include_package_data=True, install_requires=[ - 'Django >= 2.0', - 'django-any-js', - 'django-bootstrap4', - 'django-fa', - 'django-easy-audit', - 'django-local-settings', - 'django-simple-menu', - ], + 'Django >= 2.0', + 'django-any-js', + 'django-bootstrap4', + 'django-fa', + 'django-easy-audit', + 'django-local-settings', + 'django-simple-menu', + ], classifiers=[ - "Development Status :: 3 - Alpha", - "Environment :: Web Environment", - "Intended Audience :: Education", - "License :: OSI Approved :: MIT License", - "Programming Language :: Python :: 3", - "Topic :: Education", - ], + "Development Status :: 3 - Alpha", + "Environment :: Web Environment", + "Intended Audience :: Education", + "License :: OSI Approved :: MIT License", + "Programming Language :: Python :: 3", + "Topic :: Education", + ], )