django2: Replace django.core.urlresolves with django.urls

(In Django 2.0) The django.core.urlresolvers module is removed
in favor of its new location, django.urls.
It was depreacted in Django 1.10:
https://docs.djangoproject.com/en/2.0/releases/1.10/#id3

blueprint django2-support
Change-Id: I46ab5c325491274b8eaffbf848e5d80f83c2fd26
This commit is contained in:
Akihiro Motoki 2017-12-12 13:30:33 +09:00
parent 76fa01b7de
commit e477eafa45
178 changed files with 240 additions and 240 deletions

View File

@ -32,7 +32,7 @@ from django.conf import settings
from django.conf.urls import include from django.conf.urls import include
from django.conf.urls import url from django.conf.urls import url
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.encoding import python_2_unicode_compatible from django.utils.encoding import python_2_unicode_compatible
from django.utils.functional import empty from django.utils.functional import empty
from django.utils.functional import SimpleLazyObject from django.utils.functional import SimpleLazyObject

View File

@ -21,12 +21,12 @@ import six
from oslo_utils import uuidutils from oslo_utils import uuidutils
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core import urlresolvers
from django.forms import fields from django.forms import fields
from django.forms import forms from django.forms import forms
from django.forms.utils import flatatt from django.forms.utils import flatatt
from django.forms import widgets from django.forms import widgets
from django.template.loader import get_template from django.template.loader import get_template
from django import urls
from django.utils.encoding import force_text from django.utils.encoding import force_text
from django.utils.encoding import python_2_unicode_compatible from django.utils.encoding import python_2_unicode_compatible
from django.utils.functional import Promise from django.utils.functional import Promise
@ -364,11 +364,11 @@ class DynamicSelectWidget(SelectWidget):
return self.add_item_link() return self.add_item_link()
try: try:
if self.add_item_link_args: if self.add_item_link_args:
return urlresolvers.reverse(self.add_item_link, return urls.reverse(self.add_item_link,
args=self.add_item_link_args) args=self.add_item_link_args)
else: else:
return urlresolvers.reverse(self.add_item_link) return urls.reverse(self.add_item_link)
except urlresolvers.NoReverseMatch: except urls.NoReverseMatch:
return self.add_item_link return self.add_item_link

View File

@ -20,9 +20,9 @@ import logging
import types import types
from django.conf import settings from django.conf import settings
from django.core import urlresolvers
from django import shortcuts from django import shortcuts
from django.template.loader import render_to_string from django.template.loader import render_to_string
from django import urls
from django.utils.functional import Promise from django.utils.functional import Promise
from django.utils.http import urlencode from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@ -406,10 +406,10 @@ class LinkAction(BaseAction):
try: try:
if datum: if datum:
obj_id = self.table.get_object_id(datum) obj_id = self.table.get_object_id(datum)
return urlresolvers.reverse(self.url, args=(obj_id,)) return urls.reverse(self.url, args=(obj_id,))
else: else:
return urlresolvers.reverse(self.url) return urls.reverse(self.url)
except urlresolvers.NoReverseMatch as ex: except urls.NoReverseMatch as ex:
LOG.info('No reverse found for "%(url)s": %(exception)s', LOG.info('No reverse found for "%(url)s": %(exception)s',
{'url': self.url, 'exception': ex}) {'url': self.url, 'exception': ex})
return self.url return self.url

View File

@ -22,13 +22,13 @@ import sys
from django.conf import settings from django.conf import settings
from django.core import exceptions as core_exceptions from django.core import exceptions as core_exceptions
from django.core import urlresolvers
from django import forms from django import forms
from django.http import HttpResponse from django.http import HttpResponse
from django import template from django import template
from django.template.defaultfilters import slugify from django.template.defaultfilters import slugify
from django.template.defaultfilters import truncatechars from django.template.defaultfilters import truncatechars
from django.template.loader import render_to_string from django.template.loader import render_to_string
from django import urls
from django.utils.html import escape from django.utils.html import escape
from django.utils import http from django.utils import http
from django.utils.http import urlencode from django.utils.http import urlencode
@ -471,8 +471,8 @@ class Column(html.HTMLElement):
return self.link(datum, request=self.table.request) return self.link(datum, request=self.table.request)
return self.link(datum) return self.link(datum)
try: try:
return urlresolvers.reverse(self.link, args=(obj_id,)) return urls.reverse(self.link, args=(obj_id,))
except urlresolvers.NoReverseMatch: except urls.NoReverseMatch:
return self.link return self.link
if getattr(settings, 'INTEGRATION_TESTS_SUPPORT', False): if getattr(settings, 'INTEGRATION_TESTS_SUPPORT', False):

View File

@ -21,8 +21,8 @@ Template tags for customizing Horizon.
""" """
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse
from django import template from django import template
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _

View File

@ -18,12 +18,12 @@
import unittest import unittest
import uuid import uuid
from django.core.urlresolvers import reverse
from django import forms from django import forms
from django import http from django import http
from django import shortcuts from django import shortcuts
from django.template import defaultfilters from django.template import defaultfilters
from django.test.utils import override_settings from django.test.utils import override_settings
from django.urls import reverse
from django.utils.translation import ungettext_lazy from django.utils.translation import ungettext_lazy
import mock import mock

View File

@ -26,7 +26,7 @@ import django
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.core import urlresolvers from django import urls
import horizon import horizon
from horizon import base from horizon import base
@ -125,7 +125,7 @@ class BaseHorizonTests(test.TestCase):
Allows URLs to be re-calculated after registering new dashboards. Allows URLs to be re-calculated after registering new dashboards.
Useful only for testing and should never be used on a live site. Useful only for testing and should never be used on a live site.
""" """
urlresolvers.clear_url_caches() urls.clear_url_caches()
moves.reload_module(import_module(settings.ROOT_URLCONF)) moves.reload_module(import_module(settings.ROOT_URLCONF))
base.Horizon._urls() base.Horizon._urls()
@ -226,7 +226,7 @@ class HorizonTests(BaseHorizonTests):
cats = horizon.get_dashboard("cats") cats = horizon.get_dashboard("cats")
tigers = cats.get_panel("tigers") tigers = cats.get_panel("tigers")
tigers.index_url_name = "does_not_exist" tigers.index_url_name = "does_not_exist"
with self.assertRaises(urlresolvers.NoReverseMatch): with self.assertRaises(urls.NoReverseMatch):
tigers.get_absolute_url() tigers.get_absolute_url()
tigers.index_url_name = "index" tigers.index_url_name = "index"
self.assertEqual("/cats/tigers/", tigers.get_absolute_url()) self.assertEqual("/cats/tigers/", tigers.get_absolute_url())

View File

@ -17,13 +17,13 @@ from importlib import import_module
import inspect import inspect
import logging import logging
from django.core import urlresolvers
from django import forms from django import forms
from django.forms.forms import NON_FIELD_ERRORS from django.forms.forms import NON_FIELD_ERRORS
from django import template from django import template
from django.template.defaultfilters import linebreaks from django.template.defaultfilters import linebreaks
from django.template.defaultfilters import safe from django.template.defaultfilters import safe
from django.template.defaultfilters import slugify from django.template.defaultfilters import slugify
from django import urls
from django.utils.encoding import force_text from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from openstack_auth import policy from openstack_auth import policy
@ -858,8 +858,8 @@ class Workflow(html.HTMLElement):
or a standard HTTP URL. or a standard HTTP URL.
""" """
try: try:
return urlresolvers.reverse(self.success_url) return urls.reverse(self.success_url)
except urlresolvers.NoReverseMatch: except urls.NoReverseMatch:
return self.success_url return self.success_url
def format_status_message(self, message): def format_status_message(self, message):

View File

@ -16,8 +16,8 @@ import uuid
import django import django
from django.conf import settings from django.conf import settings
from django.contrib import auth from django.contrib import auth
from django.core.urlresolvers import reverse
from django import test from django import test
from django.urls import reverse
from keystoneauth1 import exceptions as keystone_exceptions from keystoneauth1 import exceptions as keystone_exceptions
from keystoneauth1.identity import v2 as v2_auth from keystoneauth1.identity import v2 as v2_auth
from keystoneauth1.identity import v3 as v3_auth from keystoneauth1.identity import v3 as v3_auth

View File

@ -15,7 +15,7 @@
from django.conf import settings from django.conf import settings
from django.core import exceptions from django.core import exceptions
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils import safestring from django.utils import safestring
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from osprofiler import _utils as profiler_utils from osprofiler import _utils as profiler_utils

View File

@ -12,8 +12,8 @@
import mock import mock
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from django.utils import html from django.utils import html
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA
from openstack_dashboard import api from openstack_dashboard import api

View File

@ -17,8 +17,8 @@
# under the License. # under the License.
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse
from django.template import defaultfilters as filters from django.template import defaultfilters as filters
from django.urls import reverse
from django.utils.http import urlencode from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy from django.utils.translation import ungettext_lazy

View File

@ -12,8 +12,8 @@
import django import django
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA
from novaclient.v2 import flavors from novaclient.v2 import flavors

View File

@ -16,7 +16,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA
from openstack_dashboard import api from openstack_dashboard import api

View File

@ -15,8 +15,8 @@
from collections import OrderedDict from collections import OrderedDict
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
import netaddr import netaddr

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA
from openstack_dashboard import api from openstack_dashboard import api

View File

@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA
from openstack_dashboard import api from openstack_dashboard import api

View File

@ -13,8 +13,8 @@
# under the License. # under the License.
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse
from django.test.utils import override_settings from django.test.utils import override_settings
from django.urls import reverse
import mock import mock

View File

@ -22,8 +22,8 @@ from oslo_utils import units
from six.moves import builtins from six.moves import builtins
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -11,9 +11,9 @@
# under the License. # under the License.
from django.conf import settings from django.conf import settings
from django.core import urlresolvers
from django import template from django import template
from django.template import defaultfilters as filters from django.template import defaultfilters as filters
from django import urls
from django.utils.translation import pgettext_lazy from django.utils.translation import pgettext_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@ -196,8 +196,8 @@ class NetworkL3AgentRoutersLinkAction(tables.LinkAction):
def get_link_url(self, datum=None): def get_link_url(self, datum=None):
obj_id = datum.id obj_id = datum.id
return urlresolvers.reverse("horizon:admin:routers:l3_agent_list", return urls.reverse("horizon:admin:routers:l3_agent_list",
args=(obj_id,)) args=(obj_id,))
class NetworkAgentsTable(tables.DataTable): class NetworkAgentsTable(tables.DataTable):

View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IgnoreArg from mox3.mox import IgnoreArg
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -13,7 +13,7 @@
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core import urlresolvers
from django.template.defaultfilters import title from django.template.defaultfilters import title
from django import urls
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy from django.utils.translation import ungettext_lazy
from keystoneclient import exceptions as keystone_exceptions from keystoneclient import exceptions as keystone_exceptions
@ -209,8 +209,8 @@ class AdminInstancesTable(tables.DataTable):
def user_link(datum): def user_link(datum):
return urlresolvers.reverse("horizon:identity:users:detail", return urls.reverse("horizon:identity:users:detail",
args=(datum.user_id,)) args=(datum.user_id,))
class AdminAuditTable(audit_tables.AuditTable): class AdminAuditTable(audit_tables.AuditTable):

View File

@ -15,8 +15,8 @@
from collections import OrderedDict from collections import OrderedDict
import uuid import uuid
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -20,8 +20,8 @@
import futurist import futurist
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -18,8 +18,8 @@ Forms for managing metadata.
""" """
import json import json
from django.core.urlresolvers import reverse
from django.forms import ValidationError from django.forms import ValidationError
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -16,8 +16,8 @@
import json import json
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA
import six import six

View File

@ -14,8 +14,8 @@
import json import json
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -14,8 +14,8 @@
import logging import logging
from django.core.urlresolvers import reverse
from django.template import defaultfilters as filters from django.template import defaultfilters as filters
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy from django.utils.translation import ungettext_lazy

View File

@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -15,7 +15,7 @@
import logging import logging
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from openstack_dashboard.dashboards.admin.networks.ports \ from openstack_dashboard.dashboards.admin.networks.ports \

View File

@ -15,7 +15,7 @@
import logging import logging
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import forms from horizon import forms

View File

@ -14,8 +14,8 @@
import logging import logging
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA
from horizon.workflows import views from horizon.workflows import views

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from openstack_dashboard.dashboards.project.networks.subnets \ from openstack_dashboard.dashboards.project.networks.subnets \
import views as project_views import views as project_views

View File

@ -14,7 +14,7 @@
import logging import logging
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -13,8 +13,8 @@
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from django.utils.http import urlunquote from django.utils.http import urlunquote
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -15,7 +15,7 @@
from collections import OrderedDict from collections import OrderedDict
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from openstack_dashboard.dashboards.admin.networks import forms \ from openstack_dashboard.dashboards.admin.networks import forms \
as networks_forms as networks_forms

View File

@ -18,9 +18,9 @@
import datetime import datetime
from django.core.urlresolvers import reverse
from django import http from django import http
from django.test.utils import override_settings from django.test.utils import override_settings
from django.urls import reverse
from django.utils import encoding from django.utils import encoding
from django.utils import timezone from django.utils import timezone

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from openstack_dashboard.dashboards.project.routers import forms as r_forms from openstack_dashboard.dashboards.project.routers import forms as r_forms

View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IgnoreArg from mox3.mox import IgnoreArg
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -17,7 +17,7 @@ Views for managing Neutron Routers.
""" """
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import tabs from horizon import tabs

View File

@ -11,9 +11,9 @@
# under the License. # under the License.
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse
from django import http from django import http
from django.test.utils import override_settings from django.test.utils import override_settings
from django.urls import reverse
from django.utils.http import urlunquote from django.utils.http import urlunquote
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from openstack_dashboard import api from openstack_dashboard import api

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy from django.utils.translation import ungettext_lazy

View File

@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django.forms import ValidationError from django.forms import ValidationError
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy from django.utils.translation import ungettext_lazy

View File

@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django.template import defaultfilters as filters from django.template import defaultfilters as filters
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy from django.utils.translation import ungettext_lazy

View File

@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IsA from mox3.mox import IsA
from horizon import exceptions from horizon import exceptions

View File

@ -15,8 +15,8 @@ Admin views for managing volumes.
""" """
from collections import OrderedDict from collections import OrderedDict
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -16,7 +16,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -15,8 +15,8 @@
import copy import copy
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse
from django.test.utils import override_settings from django.test.utils import override_settings
from django.urls import reverse
from django.utils.http import urlunquote from django.utils.http import urlunquote
import mock import mock

View File

@ -18,8 +18,8 @@ Admin views for managing volumes and snapshots.
from collections import OrderedDict from collections import OrderedDict
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -15,8 +15,8 @@
import logging import logging
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse
from django.template import defaultfilters as filters from django.template import defaultfilters as filters
from django.urls import reverse
from django.utils.http import urlencode from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy from django.utils.translation import ungettext_lazy

View File

@ -13,8 +13,8 @@
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IgnoreArg from mox3.mox import IgnoreArg
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -15,7 +15,7 @@
import logging import logging
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from openstack_auth import utils from openstack_auth import utils

View File

@ -14,8 +14,8 @@
import logging import logging
from django.core.urlresolvers import reverse
from django.template import defaultfilters from django.template import defaultfilters
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy from django.utils.translation import ungettext_lazy

View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IgnoreArg from mox3.mox import IgnoreArg
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -13,8 +13,8 @@
# under the License. # under the License.
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy from django.utils.translation import ungettext_lazy

View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IgnoreArg from mox3.mox import IgnoreArg
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import forms from horizon import forms

View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IgnoreArg from mox3.mox import IgnoreArg
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -14,8 +14,8 @@
import json import json
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IgnoreArg from mox3.mox import IgnoreArg
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -14,8 +14,8 @@
import json import json
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django.template import defaultfilters as filters from django.template import defaultfilters as filters
from django.urls import reverse
from django.utils.http import urlencode from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy from django.utils.translation import ungettext_lazy

View File

@ -18,9 +18,9 @@ import os
import unittest import unittest
import django import django
from django.core.urlresolvers import reverse
from django import http from django import http
from django.test.utils import override_settings from django.test.utils import override_settings
from django.urls import reverse
from django.utils import timezone from django.utils import timezone
from mox3.mox import IgnoreArg from mox3.mox import IgnoreArg

View File

@ -17,7 +17,7 @@
# under the License. # under the License.
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -19,7 +19,7 @@
import logging import logging
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from openstack_auth import utils from openstack_auth import utils

View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse
from django import http from django import http
from django.urls import reverse
from mox3.mox import IgnoreArg from mox3.mox import IgnoreArg
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -13,8 +13,8 @@
# under the License. # under the License.
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -19,9 +19,9 @@
from socket import timeout as socket_timeout from socket import timeout as socket_timeout
import django import django
from django.core.urlresolvers import reverse
from django import http from django import http
from django.test.utils import override_settings from django.test.utils import override_settings
from django.urls import reverse
from mox3.mox import IgnoreArg from mox3.mox import IgnoreArg
from mox3.mox import IsA from mox3.mox import IsA

View File

@ -20,8 +20,8 @@ import logging
import operator import operator
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse from django.urls import reverse
from django.core.urlresolvers import reverse_lazy from django.urls import reverse_lazy
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.views.decorators.debug import sensitive_post_parameters from django.views.decorators.debug import sensitive_post_parameters

View File

@ -16,11 +16,11 @@ from mox3.mox import IsA
import six import six
import yaml import yaml
from django.core.urlresolvers import reverse
from django.http import HttpRequest from django.http import HttpRequest
from django import template from django import template
from django.template import loader from django.template import loader
from django.test.utils import override_settings from django.test.utils import override_settings
from django.urls import reverse
from openstack_dashboard import api from openstack_dashboard import api
from openstack_dashboard.test import helpers as test from openstack_dashboard.test import helpers as test

View File

@ -18,10 +18,10 @@ import tempfile
import zipfile import zipfile
from django.conf import settings from django.conf import settings
from django.core.urlresolvers import reverse_lazy
from django import http from django import http
from django import shortcuts from django import shortcuts
from django.template.loader import render_to_string from django.template.loader import render_to_string
from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from openstack_auth import utils from openstack_auth import utils

View File

@ -17,7 +17,7 @@ Views for managing backups.
import operator import operator
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils import html from django.utils import html
from django.utils import http from django.utils import http
from django.utils import safestring from django.utils import safestring

View File

@ -11,7 +11,7 @@
# under the License. # under the License.
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from horizon import exceptions from horizon import exceptions

Some files were not shown because too many files have changed in this diff Show More