From f457520d7da9185122f366e8942bbea27a28f4e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= <jonas.havelka@volny.cz>
Date: Mon, 30 Oct 2023 23:33:13 +0100
Subject: [PATCH] =?UTF-8?q?Takhle=20u=C5=BE=20by=20=C5=A1lo=20pustit=20(ug?=
 =?UTF-8?q?ettext->gettext,=20force=5Ftext->force=5Fstr)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 aesop/ovvpfile.py          | 4 ++--
 aesop/utils.py             | 4 ++--
 aesop/views.py             | 2 +-
 galerie/models.py          | 1 -
 korektury/models.py        | 1 -
 korektury/views.py         | 1 -
 prednasky/models.py        | 1 -
 requirements.txt           | 2 +-
 seminar/views/views_all.py | 2 +-
 9 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/aesop/ovvpfile.py b/aesop/ovvpfile.py
index 4d58af35..ba0873f1 100644
--- a/aesop/ovvpfile.py
+++ b/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())
diff --git a/aesop/utils.py b/aesop/utils.py
index 3ea62dce..58b170ec 100644
--- a/aesop/utils.py
+++ b/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'
diff --git a/aesop/views.py b/aesop/views.py
index 4d1748b7..e4b3364b 100644
--- a/aesop/views.py
+++ b/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
diff --git a/galerie/models.py b/galerie/models.py
index 8e6efdc7..78551969 100644
--- a/galerie/models.py
+++ b/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
 
diff --git a/korektury/models.py b/korektury/models.py
index 8906c00c..c9d47dfa 100644
--- a/korektury/models.py
+++ b/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
diff --git a/korektury/views.py b/korektury/views.py
index 564e1331..1bdfaa92 100644
--- a/korektury/views.py
+++ b/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
diff --git a/prednasky/models.py b/prednasky/models.py
index 50c71984..dcf44cbc 100644
--- a/prednasky/models.py
+++ b/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
 
diff --git a/requirements.txt b/requirements.txt
index d51645de..53c528ab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ Unidecode
 
 # Django and modules
 
-Django<3.3
+Django<5.0
 #django-bootstrap-sass
 django-mptt
 django-reversion
diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py
index 8e71fed3..318eee21 100644
--- a/seminar/views/views_all.py
+++ b/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