From 7abdf066fadfb0841bbffa88610ab4ffbe8c03e3 Mon Sep 17 00:00:00 2001 From: Raffaele Salmaso Date: Sun, 18 Feb 2018 22:15:43 +0100 Subject: [PATCH] Import include/url from wiki.compat --- src/wiki/plugins/attachments/urls.py | 2 +- src/wiki/plugins/attachments/wiki_plugin.py | 2 +- src/wiki/plugins/globalhistory/wiki_plugin.py | 2 +- src/wiki/plugins/images/wiki_plugin.py | 2 +- src/wiki/plugins/links/wiki_plugin.py | 2 +- src/wiki/plugins/notifications/wiki_plugin.py | 2 +- src/wiki/urls.py | 2 +- testproject/testproject/urls.py | 2 +- tests/core/test_models.py | 2 +- tests/core/test_urls.py | 2 +- tests/testdata/urls.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/wiki/plugins/attachments/urls.py b/src/wiki/plugins/attachments/urls.py index 53a90fad..bf9b68a0 100644 --- a/src/wiki/plugins/attachments/urls.py +++ b/src/wiki/plugins/attachments/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from wiki.compat import url from wiki.plugins.attachments import views urlpatterns = [ diff --git a/src/wiki/plugins/attachments/wiki_plugin.py b/src/wiki/plugins/attachments/wiki_plugin.py index 09fd5399..f726b957 100644 --- a/src/wiki/plugins/attachments/wiki_plugin.py +++ b/src/wiki/plugins/attachments/wiki_plugin.py @@ -1,5 +1,5 @@ -from django.conf.urls import include, url from django.utils.translation import gettext as _ +from wiki.compat import include, url from wiki.core.plugins import registry from wiki.core.plugins.base import BasePlugin from wiki.plugins.attachments import models, settings, views diff --git a/src/wiki/plugins/globalhistory/wiki_plugin.py b/src/wiki/plugins/globalhistory/wiki_plugin.py index 9e1ff2f2..730e145d 100644 --- a/src/wiki/plugins/globalhistory/wiki_plugin.py +++ b/src/wiki/plugins/globalhistory/wiki_plugin.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from wiki.compat import url from wiki.core.plugins import registry from wiki.core.plugins.base import BasePlugin diff --git a/src/wiki/plugins/images/wiki_plugin.py b/src/wiki/plugins/images/wiki_plugin.py index 579d725f..85ea1053 100644 --- a/src/wiki/plugins/images/wiki_plugin.py +++ b/src/wiki/plugins/images/wiki_plugin.py @@ -1,5 +1,5 @@ -from django.conf.urls import url from django.utils.translation import gettext as _ +from wiki.compat import url from wiki.core.plugins import registry from wiki.core.plugins.base import BasePlugin from wiki.plugins.images import forms, models, settings, views diff --git a/src/wiki/plugins/links/wiki_plugin.py b/src/wiki/plugins/links/wiki_plugin.py index 005a3e56..dbacc3bd 100644 --- a/src/wiki/plugins/links/wiki_plugin.py +++ b/src/wiki/plugins/links/wiki_plugin.py @@ -1,6 +1,6 @@ -from django.conf.urls import url from django.urls import reverse_lazy from django.utils.translation import gettext as _ +from wiki.compat import url from wiki.core.plugins import registry from wiki.core.plugins.base import BasePlugin from wiki.plugins.links import settings, views diff --git a/src/wiki/plugins/notifications/wiki_plugin.py b/src/wiki/plugins/notifications/wiki_plugin.py index df969bd5..86e06067 100644 --- a/src/wiki/plugins/notifications/wiki_plugin.py +++ b/src/wiki/plugins/notifications/wiki_plugin.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from wiki.compat import url from wiki.core.plugins import registry from wiki.core.plugins.base import BasePlugin diff --git a/src/wiki/urls.py b/src/wiki/urls.py index 9098925c..290abe93 100644 --- a/src/wiki/urls.py +++ b/src/wiki/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from wiki.compat import include, url from wiki.conf import settings from wiki.core.plugins import registry from wiki.core.plugins.loader import load_wiki_plugins diff --git a/testproject/testproject/urls.py b/testproject/testproject/urls.py index 5d5afa71..0b1a49d3 100644 --- a/testproject/testproject/urls.py +++ b/testproject/testproject/urls.py @@ -1,10 +1,10 @@ from django.conf import settings -from django.conf.urls import include, url from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.http.response import HttpResponse from django.views.static import serve as static_serve from django_nyt.urls import get_pattern as get_notify_pattern +from wiki.compat import include, url from wiki.urls import get_pattern as get_wiki_pattern admin.autodiscover() diff --git a/tests/core/test_models.py b/tests/core/test_models.py index 3d22cec2..2b1e9d59 100644 --- a/tests/core/test_models.py +++ b/tests/core/test_models.py @@ -1,9 +1,9 @@ from django.apps import apps -from django.conf.urls import url from django.contrib.auth import get_user_model from django.contrib.sites.models import Site from django.test.testcases import TestCase +from wiki.compat import include, url from wiki.conf import settings from wiki.managers import ArticleManager from wiki.models import Article, ArticleRevision, URLPath diff --git a/tests/core/test_urls.py b/tests/core/test_urls.py index db7dd697..e40f031a 100644 --- a/tests/core/test_urls.py +++ b/tests/core/test_urls.py @@ -1,8 +1,8 @@ -from django.conf.urls import url from django.contrib.auth import get_user_model from django.contrib.sites.models import Site from django.test.testcases import TestCase from django_nyt.urls import get_pattern as get_notify_pattern +from wiki.compat import include, url from wiki.models import Article, URLPath from wiki.urls import get_pattern as get_wiki_pattern from wiki.urls import WikiURLPatterns diff --git a/tests/testdata/urls.py b/tests/testdata/urls.py index 5d42cac3..a9fbc6c4 100644 --- a/tests/testdata/urls.py +++ b/tests/testdata/urls.py @@ -1,8 +1,8 @@ from django.conf import settings -from django.conf.urls import include, url from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django_nyt.urls import get_pattern as get_notify_pattern +from wiki.compat import include, url from wiki.urls import get_pattern as get_wiki_pattern admin.autodiscover() -- 2.45.2