chore: Modernise a bit

mailadminsite/settings.py

@@ -1,9 +1,8 @@
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-import os
+from pathlib import Path
 import ldap
 from django_auth_ldap.config import LDAPSearch, PosixGroupType
 
-BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+BASE_DIR = Path(__file__).parent.parent
 
 
 # Quick-start development settings - unsuitable for production
@@ -50,7 +49,7 @@ WSGI_APPLICATION = 'mailadminsite.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'NAME': BASE_DIR.joinpath('db.sqlite3'),
     }
 }
 
@@ -68,6 +67,7 @@ TEMPLATES = [
                 'django.template.context_processors.static',
                 'django.template.context_processors.tz',
                 'django.contrib.messages.context_processors.messages',
+                'django.template.context_processors.request',
             ],
         },
     },
@@ -78,14 +78,12 @@ TEMPLATES = [
 LANGUAGE_CODE = 'nb'
 TIME_ZONE = 'Europe/Oslo'
 USE_I18N = True
-USE_L10N = True
 USE_TZ = True
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
-STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
+STATIC_ROOT = BASE_DIR.joinpath('staticfiles')
 
 LOGIN_REDIRECT_URL = '/lists/'
 
@@ -154,6 +152,8 @@ REST_FRAMEWORK = {
     )
 }
 
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
 # Local settings
 try:
     from .local_settings import *

mailadminsite/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.urls import include, path, re_path
 from django.contrib import admin
 from django.contrib.auth.views import LoginView
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
@@ -8,11 +8,11 @@ from mailadmin import urls as mailadmin_urls
 from mailadmin.views import logout
 
 urlpatterns = [
-    url(r'', include(mailadmin_urls)),
-    url(r'^admin/', admin.site.urls),
-    url(r'^api-auth/', include(rest_framework_urls, namespace='rest_framework')),
-    url(r'^accounts/login/$', LoginView.as_view(), name='login'),
-    url(r'^accounts/logout/$', logout, name='logout')
+    path('', include(mailadmin_urls)),
+    re_path(r'^admin/', admin.site.urls),
+    path('api-auth/', include(rest_framework_urls, namespace='rest_framework')),
+    path('accounts/login/', LoginView.as_view(), name='login'),
+    path('accounts/logout/', logout, name='logout')
 ]
 
 urlpatterns += staticfiles_urlpatterns()