Remove support for old Python and Django versions

matthiask · matthiask · commit c4f9b02b1372 · 2020-05-22T06:12:08.000+02:00
diff --git a/app/articles/apps.py b/app/articles/apps.py
@@ -2,7 +2,7 @@
 
 from django.apps import AppConfig
 from django.utils.text import capfirst
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class ArticlesConfig(AppConfig):
diff --git a/app/articles/models.py b/app/articles/models.py
@@ -2,8 +2,7 @@
 
 from django.db import models
 from django.utils import timezone
-from django.utils.encoding import python_2_unicode_compatible
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from feincms3.apps import reverse_app
 from feincms3.cleanse import CleansedRichTextField
@@ -21,7 +20,6 @@ def published(self):
         )
 
 
-@python_2_unicode_compatible
 class Article(models.Model):
     """
     The articles models. We're using the ``CleansedRichTextField`` field
diff --git a/app/articles/urls.py b/app/articles/urls.py
@@ -1,18 +1,16 @@
-from __future__ import unicode_literals
-
-from django.conf.urls import url
+from django.urls import re_path
 
 from app.articles import views
 
 
 app_name = 'articles'
 urlpatterns = [
-    url(
+    re_path(
         r'^$',
         views.article_list,
         name='article-list',
     ),
-    url(
+    re_path(
         r'^(?P<year>\d{4})/(?P<slug>[-\w]+)/$',
         views.article_detail,
         name='article-detail',
diff --git a/app/pages/admin.py b/app/pages/admin.py
@@ -2,7 +2,7 @@
 
 from django.contrib import admin
 from django.utils.text import capfirst
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from content_editor.admin import ContentEditor
 from feincms3.admin import TreeAdmin
diff --git a/app/pages/apps.py b/app/pages/apps.py
@@ -2,7 +2,7 @@
 
 from django.apps import AppConfig
 from django.utils.text import capfirst
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class PagesConfig(AppConfig):
diff --git a/app/pages/models.py b/app/pages/models.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from content_editor.models import Region, Template, create_plugin_base
 
diff --git a/app/pages/urls.py b/app/pages/urls.py
@@ -1,23 +1,21 @@
-from __future__ import unicode_literals
-
-from django.conf.urls import url
 from django.http import HttpResponseRedirect
+from django.urls import re_path
 
 from app.pages import views
 
 
 app_name = 'pages'
 urlpatterns = [
-    url(
+    re_path(
         r'^$',
         lambda request: HttpResponseRedirect('/%s/' % request.LANGUAGE_CODE),
     ),
-    url(
+    re_path(
         r'^(?P<path>[-\w/]+)/$',
         views.page_detail,
         name='page',
     ),
-    url(
+    re_path(
         r'^$',
         views.page_detail,
         name='root',
diff --git a/app/settings.py b/app/settings.py
@@ -11,7 +11,7 @@
 """
 
 import os
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
diff --git a/app/urls.py b/app/urls.py
@@ -1,12 +1,12 @@
 from django.conf import settings
-from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.contrib import admin
+from django.urls import include, re_path
 
 
 urlpatterns = static(
     settings.MEDIA_URL, document_root=settings.MEDIA_ROOT,
 ) + [
-    url(r'^admin/', admin.site.urls),
-    url(r'', include('app.pages.urls')),
+    re_path(r'^admin/', admin.site.urls),
+    re_path(r'', include('app.pages.urls')),
 ]
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-Django>=2.2,<3.0
+Django
 feincms3[all]

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Django>=2.2,<3.0`
	`1`	`+Django`
`2`	`2`	`feincms3[all]`