update dependencies and upgrade code for django where needed/possible

src/c3nav/mapdata/models/access.py

@@ -9,8 +9,8 @@ from django.core.cache import cache
 from django.db import models, transaction
 from django.db.models import Q
 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.mapdata.models import MapUpdate
 from c3nav.mapdata.models.base import SerializableMixin, TitledMixin
@@ -130,7 +130,7 @@ class AccessPermissionToken(models.Model):
 
     @property
     def redeem_success_message(self):
-        return ungettext_lazy('Area successfully unlocked.', 'Areas successfully unlocked.', len(self.restrictions))
+        return ngettext_lazy('Area successfully unlocked.', 'Areas successfully unlocked.', len(self.restrictions))
 
 
 class AccessPermission(models.Model):

src/c3nav/mapdata/models/base.py

@@ -4,7 +4,7 @@ from django.core.cache import cache
 from django.db import models
 from django.db.models import Q
 from django.utils.translation import get_language, get_language_info
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from c3nav.mapdata.fields import I18nField
 from c3nav.mapdata.models import MapUpdate

src/c3nav/mapdata/models/geometry/base.py

@@ -3,7 +3,7 @@ from contextlib import contextmanager
 
 from django.db import models
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from shapely.geometry import Point, box
 from shapely.ops import unary_union
 

src/c3nav/mapdata/models/geometry/level.py

@@ -10,7 +10,7 @@ from django.db import models
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.text import format_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from scipy.sparse.csgraph._shortest_path import dijkstra
 from shapely import prepared
 from shapely.affinity import scale

src/c3nav/mapdata/models/geometry/space.py

@@ -7,7 +7,7 @@ from django.db import models
 from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.text import format_lazy
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from shapely.geometry import CAP_STYLE, JOIN_STYLE, mapping
 
 from c3nav.mapdata.fields import GeometryField, I18nField, JSONField

src/c3nav/mapdata/models/graph.py

@@ -2,7 +2,7 @@ from decimal import Decimal
 
 from django.core.validators import MinValueValidator
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from c3nav.mapdata.fields import GeometryField, I18nField
 from c3nav.mapdata.models.access import AccessRestrictionMixin

src/c3nav/mapdata/models/level.py

@@ -6,7 +6,7 @@ from django.core.validators import MinValueValidator
 from django.db import models
 from django.urls import reverse
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from shapely.ops import cascaded_union
 
 from c3nav.mapdata.models.locations import SpecificLocation

src/c3nav/mapdata/models/locations.py

@@ -6,16 +6,16 @@ from operator import attrgetter
 
 from django.conf import settings
 from django.core.cache import cache
+from django.core.exceptions import FieldDoesNotExist
 from django.core.validators import MaxValueValidator, MinValueValidator, RegexValidator
 from django.db import models, transaction
-from django.db.models import FieldDoesNotExist, Prefetch
+from django.db.models import Prefetch
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
 from django.utils.text import format_lazy
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext_lazy
+from django.utils.translation import gettext_lazy as _, ngettext_lazy
 
 from c3nav.mapdata.fields import I18nField
 from c3nav.mapdata.grid import grid
@@ -396,7 +396,7 @@ class LocationGroup(Location, models.Model):
         if hasattr(self, 'locations'):
             return format_lazy(_('{category_title}, {num_locations}'),
                                category_title=result,
-                               num_locations=(ungettext_lazy('%(num)d location', '%(num)d locations', 'num') %
+                               num_locations=(ngettext_lazy('%(num)d location', '%(num)d locations', 'num') %
                                               {'num': len(self.locations)}))
         return result
 

src/c3nav/mapdata/models/report.py

@@ -8,7 +8,7 @@ from django.db.models import Q
 from django.urls import reverse
 from django.utils.crypto import get_random_string
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from c3nav.mapdata.fields import I18nField
 from c3nav.mapdata.models.geometry.level import LevelGeometryMixin
@@ -172,7 +172,7 @@ class ReportUpdate(models.Model):
     report = models.ForeignKey(Report, on_delete=models.CASCADE, related_name='updates')
     datetime = models.DateTimeField(auto_now_add=True, verbose_name=_('datetime'))
     author = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT, verbose_name=_('author'))
-    open = models.NullBooleanField(verbose_name=_('open'))
+    open = models.BooleanField(null=True, verbose_name=_('open'))
     comment = models.TextField(verbose_name=_('comment'), blank=True)
     assigned_to = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT,
                                     related_name='report_update_assigns', verbose_name=_('assigned to'))

src/c3nav/mapdata/models/source.py

@@ -2,7 +2,7 @@ import os
 
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from c3nav.mapdata.models.access import AccessRestrictionMixin
 from c3nav.mapdata.models.base import BoundsMixin

src/c3nav/mapdata/models/update.py

@@ -10,7 +10,7 @@ from django.core.cache import cache
 from django.db import models, transaction
 from django.utils.http import int_to_base36
 from django.utils.timezone import make_naive
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from c3nav.mapdata.tasks import process_map_updates