django.core.urlresolvers moved to django.urls

Django 2.0

orchestra/admin/__init__.py

@@ -3,7 +3,7 @@ from collections import OrderedDict
 from functools import update_wrapper
 
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import render, redirect
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _

orchestra/admin/dashboard.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from fluent_dashboard import dashboard, appsettings
 from fluent_dashboard.modules import CmsAppIconList

orchestra/admin/menu.py

@@ -1,7 +1,7 @@
 from copy import deepcopy
 
 from admin_tools.menu import items, Menu
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.text import capfirst
 from django.utils.translation import ugettext_lazy as _
 

orchestra/admin/utils.py

@@ -6,7 +6,7 @@ from functools import wraps
 from django.conf import settings
 from django.contrib import admin
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse, NoReverseMatch
+from django.urls import reverse, NoReverseMatch
 from django.db import models
 from django.shortcuts import redirect
 from django.utils import timezone

orchestra/api/helpers.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import NoReverseMatch
+from django.urls import NoReverseMatch
 from rest_framework.reverse import reverse
 
 

orchestra/contrib/accounts/actions.py

@@ -4,7 +4,7 @@ from django.contrib import messages
 from django.contrib.admin import helpers
 from django.contrib.admin.utils import NestedObjects, quote
 from django.contrib.auth import get_permission_codename
-from django.core.urlresolvers import reverse, NoReverseMatch
+from django.urls import reverse, NoReverseMatch
 from django.db import router
 from django.shortcuts import redirect, render
 from django.template.response import TemplateResponse

orchestra/contrib/accounts/admin.py

@@ -8,7 +8,7 @@ from django.conf.urls import url
 from django.contrib import admin, messages
 from django.contrib.admin.utils import unquote
 from django.contrib.auth import admin as auth
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponseRedirect
 from django.templatetags.static import static
 from django.utils.safestring import mark_safe

orchestra/contrib/bills/actions.py

@@ -5,7 +5,7 @@ from datetime import date
 from django.contrib import messages
 from django.contrib.admin import helpers
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import transaction
 from django.forms.models import modelformset_factory
 from django.http import HttpResponse, HttpResponseRedirect

orchestra/contrib/bills/admin.py

@@ -2,7 +2,7 @@ from django import forms
 from django.conf.urls import url
 from django.contrib import admin, messages
 from django.contrib.admin.utils import unquote
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.db.models import F, Sum, Prefetch
 from django.db.models.functions import Coalesce

orchestra/contrib/bills/filters.py

@@ -1,5 +1,5 @@
 from django.contrib.admin import SimpleListFilter
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Q
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _

orchestra/contrib/bills/helpers.py

@@ -1,5 +1,5 @@
 from django.contrib import messages
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.encoding import force_text
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe

orchestra/contrib/bills/models.py

@@ -1,7 +1,7 @@
 import datetime
 from dateutil.relativedelta import relativedelta
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.validators import ValidationError, RegexValidator
 from django.db import models
 from django.db.models import F, Sum

orchestra/contrib/databases/tests/functional_tests/tests.py

@@ -6,7 +6,7 @@ import unittest
 import MySQLdb
 from django.conf import settings as djsettings
 from django.core.management.base import CommandError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from orchestra.admin.utils import change_url
 from orchestra.contrib.orchestration.models import Route, Server
 from orchestra.utils.sys import sshrun

orchestra/contrib/domains/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.db.models.functions import Concat, Coalesce
 from django.templatetags.static import static

orchestra/contrib/domains/tests/functional_tests/tests.py

@@ -4,7 +4,7 @@ import socket
 from functools import partial
 
 from django.conf import settings as djsettings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from selenium.webdriver.support.select import Select
 
 from orchestra.contrib.orchestration.models import Server, Route

orchestra/contrib/history/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse, NoReverseMatch
+from django.urls import reverse, NoReverseMatch
 from django.contrib.admin.templatetags.admin_urls import add_preserved_filters
 from django.http import HttpResponseRedirect
 from django.contrib.admin.utils import unquote

orchestra/contrib/issues/admin.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.conf.urls import url
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404

orchestra/contrib/lists/tests/functional_tests/tests.py

@@ -7,7 +7,7 @@ from email.mime.text import MIMEText
 import requests
 from django.conf import settings as djsettings
 from django.core.management.base import CommandError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from orchestra.admin.utils import change_url
 from orchestra.contrib.domains.models import Domain
 from orchestra.contrib.orchestration.models import Route, Server

orchestra/contrib/mailboxes/admin.py

@@ -3,7 +3,7 @@ from urllib.parse import parse_qs
 
 from django import forms
 from django.contrib import admin, messages
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import F, Count, Value as V
 from django.db.models.functions import Concat
 from django.utils.safestring import mark_safe

orchestra/contrib/mailboxes/tests/functional_tests/tests.py

@@ -11,7 +11,7 @@ from django.apps import apps
 from django.conf import settings as djsettings
 from django.contrib.contenttypes.models import ContentType
 from django.core.management.base import CommandError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from selenium.webdriver.support.select import Select
 
 from orchestra.contrib.orchestration.models import Server, Route

orchestra/contrib/mailer/actions.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import redirect
 
 

orchestra/contrib/mailer/admin.py

@@ -3,7 +3,7 @@ import email
 
 from django import forms
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Count
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _

orchestra/contrib/miscellaneous/admin.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _

orchestra/contrib/orchestration/helpers.py

@@ -2,7 +2,7 @@ import textwrap
 
 from django.contrib import messages
 from django.core.mail import mail_admins
-from django.core.urlresolvers import reverse, NoReverseMatch
+from django.urls import reverse, NoReverseMatch
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import ungettext, ugettext_lazy as _

orchestra/contrib/orchestration/middlewares.py

@@ -1,7 +1,7 @@
 from threading import local
 
 from django.contrib.admin.models import LogEntry
-from django.core.urlresolvers import resolve
+from django.urls import resolve
 from django.db import transaction
 from django.db.models.signals import pre_delete, post_save, m2m_changed
 from django.dispatch import receiver

orchestra/contrib/orders/actions.py

@@ -1,5 +1,5 @@
 from django.contrib import admin, messages
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import transaction
 from django.utils import timezone
 from django.utils.safestring import mark_safe

orchestra/contrib/orders/admin.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.contrib import admin
-from django.core.urlresolvers import reverse, NoReverseMatch
+from django.urls import reverse, NoReverseMatch
 from django.db.models import Prefetch
 from django.utils import timezone
 from django.utils.html import escape

orchestra/contrib/payments/actions.py

@@ -2,7 +2,7 @@ from functools import partial
 
 from django.contrib import messages
 from django.contrib.admin import actions
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import transaction
 from django.shortcuts import render, redirect
 from django.utils.safestring import mark_safe

orchestra/contrib/payments/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponseRedirect
 from django.utils.translation import ugettext_lazy as _
 

orchestra/contrib/plans/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 

orchestra/contrib/resources/actions.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.shortcuts import redirect, render
 from django.utils.safestring import mark_safe
 from django.utils.translation import ungettext, ugettext_lazy as _

orchestra/contrib/resources/admin.py

@@ -6,7 +6,7 @@ from django.contrib import admin, messages
 from django.contrib.contenttypes.admin import GenericTabularInline
 from django.contrib.contenttypes.forms import BaseGenericInlineFormSet
 from django.contrib.admin.utils import unquote
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Q
 from django.shortcuts import redirect
 from django.templatetags.static import static

orchestra/contrib/saas/services/phplist.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.core import validators
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Q
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _

orchestra/contrib/services/actions.py

@@ -1,5 +1,5 @@
 from django.contrib.admin import helpers
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import transaction
 from django.shortcuts import render, redirect
 from django.template.response import TemplateResponse

orchestra/contrib/services/admin.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.conf.urls import url
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _

orchestra/contrib/systemusers/tests/functional_tests/tests.py

@@ -8,7 +8,7 @@ from functools import partial
 import paramiko
 from django.conf import settings as djsettings
 from django.core.management.base import CommandError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from selenium.webdriver.support.select import Select
 
 from orchestra.admin.utils import change_url

orchestra/contrib/webapps/admin.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext, ugettext_lazy as _
 

orchestra/contrib/webapps/types/cms.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers

orchestra/contrib/websites/admin.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.contrib import admin
-from django.core.urlresolvers import resolve
+from django.urls import resolve
 from django.db.models import Q
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _

orchestra/models/fields.py

@@ -1,7 +1,7 @@
 import os
 
 from django.core import exceptions
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.db.models.fields.files import FileField, FieldFile
 from django.utils.text import capfirst

orchestra/permissions/api.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import resolve
+from django.urls import resolve
 from rest_framework.permissions import DjangoModelPermissions
 
 

orchestra/templatetags/utils.py

@@ -4,7 +4,7 @@ import re
 
 from django import template
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse, NoReverseMatch
+from django.urls import reverse, NoReverseMatch
 from django.forms import CheckboxInput
 from django.template.base import Node
 from django.template.defaultfilters import date

orchestra/utils/tests.py

@@ -5,7 +5,7 @@ from functools import wraps
 from django.conf import settings
 from django.contrib.auth import BACKEND_SESSION_KEY, SESSION_KEY
 from django.contrib.sessions.backends.db import SessionStore
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import LiveServerTestCase, TestCase
 from selenium.webdriver.firefox.webdriver import WebDriver
 from xvfbwrapper import Xvfb