11 files changed, 11 insertions(+), 11 deletions(-)

M src/wiki/plugins/attachments/urls.py
M src/wiki/plugins/attachments/wiki_plugin.py
M src/wiki/plugins/globalhistory/wiki_plugin.py
M src/wiki/plugins/images/wiki_plugin.py
M src/wiki/plugins/links/wiki_plugin.py
M src/wiki/plugins/notifications/wiki_plugin.py
M src/wiki/urls.py
M testproject/testproject/urls.py
M tests/core/test_models.py
M tests/core/test_urls.py
M tests/testdata/urls.py

@@ 1,4 1,4 @@
-from django.conf.urls import url
+from wiki.compat import url
 from wiki.plugins.attachments import views
 
 urlpatterns = [

@@ 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

@@ 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
 

@@ 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

@@ 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

@@ 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
 

@@ 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

@@ 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()

@@ 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

@@ 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

@@ 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()