aesop/ovvpfile.py

@@ -1,5 +1,5 @@
 from django.http import HttpResponse
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 
 class OvvpFile:
@@ -20,7 +20,7 @@ class OvvpFile:
 		yield '\t'.join(self.columns) + '\n'
 		# rows
 		for r in self.rows:
-			yield '\t'.join([force_text(r[c]) for c in self.columns]) + '\n'
+			yield '\t'.join([force_str(r[c]) for c in self.columns]) + '\n'
 
 	def to_string(self):
 		return ''.join(self.to_lines())

aesop/utils.py

@@ -1,6 +1,6 @@
 import datetime
 
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from aesop.ovvpfile import OvvpFile
 
@@ -9,7 +9,7 @@ def default_ovvpfile(event, rocnik):
     of = OvvpFile()
     of.headers['version'] = '1'
     of.headers['event'] = event
-    of.headers['year'] = force_text(rocnik.prvni_rok)
+    of.headers['year'] = force_str(rocnik.prvni_rok)
     of.headers['date'] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     of.headers['id-scope'] = 'mam'
     of.headers['id-generation'] = '1'

aesop/views.py

@@ -8,7 +8,7 @@ from django.shortcuts import get_object_or_404
 from django.http import HttpResponse
 from django.urls import reverse
 from django.views import generic
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from .utils import default_ovvpfile
 from seminar.models import Rocnik, Soustredeni

galerie/models.py

@@ -2,7 +2,6 @@
 
 from django.db import models
 #from django.db.models import Q
-from django.utils.encoding import force_text
 from imagekit.models import ImageSpecField
 from imagekit.processors import ResizeToFit, Transpose
 

korektury/models.py

@@ -16,7 +16,6 @@ import os
 from django.db import models
 from django.utils import timezone
 from django.conf import settings
-from django.utils.encoding import force_text
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.functional import cached_property
 from django.utils.text import get_valid_filename

korektury/views.py

@@ -5,7 +5,6 @@ třídy většinou rozšiřující nějakou třídu z :mod:`django.views.generic
 """
 from django.shortcuts import get_object_or_404, render
 from django.views import generic
-from django.utils.translation import ugettext as _
 from django.conf import settings
 from django.http import HttpResponseForbidden
 from django.core.mail import EmailMessage

mamweb/settings_common.py

@@ -28,7 +28,6 @@ APPEND_SLASH = True
 LANGUAGE_CODE = 'cs'
 TIME_ZONE = 'Europe/Prague'
 USE_I18N = True
-USE_L10N = True
 USE_TZ = True
 
 # Static files (CSS, JavaScript, Images)

prednasky/models.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from django.db import models
-from django.utils.encoding import force_text
 
 from seminar.models import Organizator, Soustredeni
 

requirements.txt

@@ -14,7 +14,7 @@ Unidecode
 
 # Django and modules
 
-Django<3.3
+Django<5.0
 #django-bootstrap-sass
 django-mptt
 django-reversion

seminar/migrations/0006_problem_add_timestamp.py

@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 
 from django.db import models, migrations
 import datetime
-from django.utils.timezone import utc
 
 
 class Migration(migrations.Migration):
@@ -16,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='problem',
             name='timestamp',
-            field=models.DateTimeField(default=datetime.datetime(2015, 5, 15, 8, 54, 56, 319985, tzinfo=utc), verbose_name='vytvo\u0159eno', auto_now=True),
+            field=models.DateTimeField(default=datetime.datetime(2015, 5, 15, 8, 54, 56, 319985, tzinfo=datetime.timezone.utc), verbose_name='vytvo\u0159eno', auto_now=True),
             preserve_default=False,
         ),
         migrations.AlterField(

seminar/templates/seminar/archiv/cisla.html

@@ -40,7 +40,9 @@
             {% endif %}
           {% endfor %}
           </ul>
-          <a href='{{ rocnik.verejne_url }}'>Výsledková listina</a> <!-- FIXME:  url výsledkovky-->
+          {% if rocnik.verejne_vysledkovky_cisla %} {# Tohle jsem asi neměl tady použít, ale šlo to… #}
+            <a href='{{ rocnik.verejne_url }}#vysledky'>Výsledková listina</a> <!-- FIXME:  url výsledkovky-->
+          {% endif %}
       </div>
 
       </div>

seminar/templates/seminar/archiv/rocnik.html

@@ -113,7 +113,7 @@
 
 
   {% if vysledkovka.radky_vysledkovky %}
-    <h2>Výsledková listina</h2>
+    <h2 id=vysledky>Výsledková listina</h2>
       {% include "vysledkovky/vysledkovka_rocnik.html" %}
   {% endif %}
 

seminar/views/views_all.py

@@ -3,7 +3,7 @@ from django.http import HttpResponse
 from django.urls import reverse
 from django.core.exceptions import ObjectDoesNotExist
 from django.views import generic
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.http import Http404
 from django.db.models import Q, Sum, Count
 from django.views.generic.base import RedirectView