update dependencies and upgrade code for django where needed/possible

src/c3nav/control/admin.py

@@ -2,7 +2,7 @@ from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 from django.contrib.auth.models import User
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from c3nav.control.models import UserPermissions
 

src/c3nav/control/forms.py

@@ -11,8 +11,8 @@ from django.contrib.auth.models import User
 from django.db.models import Prefetch
 from django.forms import ChoiceField, Form, IntegerField, ModelForm, Select
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext_lazy
 
 from c3nav.control.models import UserPermissions, UserSpaceAccess
 from c3nav.mapdata.forms import I18nModelFormMixin
@@ -81,9 +81,9 @@ class AccessPermissionForm(Form):
 
         # construct choice field for access permissions
         choices = [('', _('choose permissions…')),
-                   ('all', ungettext_lazy('everything possible (%d permission)',
-                                          'everything possible (%d permissions)',
-                                          len(access_restrictions)) % len(access_restrictions))]
+                   ('all', ngettext_lazy('everything possible (%d permission)',
+                                         'everything possible (%d permissions)',
+                                         len(access_restrictions)) % len(access_restrictions))]
 
         choices.append((_('Access Permission Groups'), tuple(
             ('g%d' % group.pk, group.title)
@@ -102,18 +102,18 @@ class AccessPermissionForm(Form):
         ]
         for minutes in range(15, 60, 15):
             expire_choices.append(
-                (str(minutes), ungettext_lazy('in %d minute', 'in %d minutes', minutes) % minutes))
+                (str(minutes), ngettext_lazy('in %d minute', 'in %d minutes', minutes) % minutes))
 
         for hours in chain(range(1, 6), range(6, 24, 6)):
             expire_choices.append(
-                (str(hours*60), ungettext_lazy('in %d hour', 'in %d hours', hours) % hours)
+                (str(hours*60), ngettext_lazy('in %d hour', 'in %d hours', hours) % hours)
             )
         expire_choices.insert(
             5, (str(90), _('in 1½ hour'))
         )
         for days in range(1, 14):
             expire_choices.append(
-                (str(days*24*60), ungettext_lazy('in %d day', 'in %d days', days) % days)
+                (str(days*24*60), ngettext_lazy('in %d day', 'in %d days', days) % days)
             )
 
         self.fields['expires'] = ChoiceField(required=False, initial='60', choices=expire_choices)

src/c3nav/control/models.py

@@ -6,7 +6,7 @@ from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.db import models, transaction
 from django.utils.functional import cached_property, lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from c3nav.mapdata.models import Space
 

src/c3nav/control/urls.py

@@ -1,15 +1,15 @@
-from django.conf.urls import url
+from django.urls import path
 
 from c3nav.control.views import (announcement_detail, announcement_list, grant_access, grant_access_qr, main_index,
                                  map_updates, user_detail, user_list)
 
 urlpatterns = [
-    url(r'^users/$', user_list, name='control.users'),
-    url(r'^users/(?P<user>\d+)/$', user_detail, name='control.users.detail'),
-    url(r'^access/$', grant_access, name='control.access'),
-    url(r'^access/(?P<token>[^/]+)$', grant_access_qr, name='control.access.qr'),
-    url(r'^announcements/$', announcement_list, name='control.announcements'),
-    url(r'^announcements/(?P<announcement>\d+)/$', announcement_detail, name='control.announcements.detail'),
-    url(r'^mapupdates/$', map_updates, name='control.map_updates'),
-    url(r'^$', main_index, name='control.index'),
+    path('users/', user_list, name='control.users'),
+    path('users/<int:user>/', user_detail, name='control.users.detail'),
+    path('access/', grant_access, name='control.access'),
+    path('access/<str:token>', grant_access_qr, name='control.access.qr'),
+    path('announcements/', announcement_list, name='control.announcements'),
+    path('announcements/<int:annoucement>/', announcement_detail, name='control.announcements.detail'),
+    path('mapupdates/', map_updates, name='control.map_updates'),
+    path('', main_index, name='control.index'),
 ]

src/c3nav/control/views.py

@@ -17,7 +17,7 @@ from django.urls import reverse
 from django.utils import timezone
 from django.utils.crypto import get_random_string
 from django.utils.timezone import make_aware
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from c3nav.control.forms import (AccessPermissionForm, AnnouncementForm, MapUpdateFilterForm, MapUpdateForm,
                                  UserPermissionsForm, UserSpaceAccessForm)