From 9d2620978fc1b2c40f2a9d5d0738e60af11420a5 Mon Sep 17 00:00:00 2001 From: Emiliano Beronich Date: Tue, 28 Jun 2022 13:27:03 -0300 Subject: [PATCH 1/2] Replace smart_text by smart_str, force_text by force_str. --- wintergear/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wintergear/__init__.py b/wintergear/__init__.py index 19ccf6d..ea9e7f6 100644 --- a/wintergear/__init__.py +++ b/wintergear/__init__.py @@ -6,7 +6,7 @@ # LICENSE file in the root directory of this source tree. from django.conf import settings -from django.utils.encoding import force_text +from django.utils.encoding import force_str from shoop.apps import AppConfig from shoop.xtheme import Theme @@ -20,14 +20,16 @@ class WintergearTheme(Theme): def get_view(self, view_name): import wintergear.views as views + return getattr(views, view_name, None) def _format_cms_links(self, **query_kwargs): if "shoop.simple_cms" not in settings.INSTALLED_APPS: return from shoop.simple_cms.models import Page + for page in Page.objects.visible().filter(**query_kwargs): - yield {"url": "/%s" % page.url, "text": force_text(page)} + yield {"url": "/%s" % page.url, "text": force_str(page)} def get_cms_navigation_links(self): return self._format_cms_links(visible_in_menu=True) @@ -37,9 +39,7 @@ class WintergearThemeAppConfig(AppConfig): name = "wintergear" verbose_name = WintergearTheme.name label = "wintergear" - provides = { - "xtheme": "wintergear:WintergearTheme" - } + provides = {"xtheme": "wintergear:WintergearTheme"} default_app_config = "wintergear.WintergearThemeAppConfig" From 889464ba838e19b98fb2c5754ad92694aa293f09 Mon Sep 17 00:00:00 2001 From: Emiliano Beronich Date: Tue, 28 Jun 2022 15:01:47 -0300 Subject: [PATCH 2/2] Replace url by re_path, as it will be removed (url is already redirected to re_path). --- shoop_demo/urls.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/shoop_demo/urls.py b/shoop_demo/urls.py index 1f9c616..8658846 100644 --- a/shoop_demo/urls.py +++ b/shoop_demo/urls.py @@ -7,7 +7,7 @@ import os from django.conf import settings -from django.conf.urls import patterns, include, url +from django.conf.urls import patterns, include, re_path from django.conf.urls.static import static from django.contrib import admin import shoop.admin.urls @@ -15,22 +15,22 @@ def _ns_url(regex, urls, name): - return url(regex, include(urls, namespace=name, app_name=name)) + return re_path(regex, include(urls, namespace=name, app_name=name)) _URLS = [ - _ns_url(r'^sa/', shoop.admin.urls, 'shoop_admin'), - _ns_url(r'^', shoop.front.urls, 'shoop'), + _ns_url(r"^sa/", shoop.admin.urls, "shoop_admin"), + _ns_url(r"^", shoop.front.urls, "shoop"), ] _STATIC_DIRS = [ - 'static_src', - 'bower_components', + "static_src", + "bower_components", ] _STATIC_MAP = [ (settings.MEDIA_URL, settings.MEDIA_ROOT), -] + [('/' + x + '/', os.path.join(settings.BASE_DIR, x)) for x in _STATIC_DIRS] +] + [("/" + x + "/", os.path.join(settings.BASE_DIR, x)) for x in _STATIC_DIRS] def _get_statics(): @@ -42,4 +42,4 @@ def _get_statics(): return result -urlpatterns = patterns('', *_URLS) + _get_statics() +urlpatterns = patterns("", *_URLS) + _get_statics()