Browse Source

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
Akihiro Motoki 1 year ago
parent
commit
e477eafa45
100 changed files with 131 additions and 131 deletions
  1. 1
    1
      horizon/base.py
  2. 5
    5
      horizon/forms/fields.py
  3. 4
    4
      horizon/tables/actions.py
  4. 3
    3
      horizon/tables/base.py
  5. 1
    1
      horizon/templatetags/branding.py
  6. 1
    1
      horizon/test/unit/tables/test_tables.py
  7. 3
    3
      horizon/test/unit/test_base.py
  8. 3
    3
      horizon/workflows/base.py
  9. 1
    1
      openstack_auth/tests/unit/test_auth.py
  10. 1
    1
      openstack_dashboard/contrib/developer/profiler/middleware.py
  11. 1
    1
      openstack_dashboard/dashboards/admin/aggregates/tests.py
  12. 1
    1
      openstack_dashboard/dashboards/admin/aggregates/views.py
  13. 1
    1
      openstack_dashboard/dashboards/admin/defaults/tests.py
  14. 1
    1
      openstack_dashboard/dashboards/admin/flavors/tables.py
  15. 1
    1
      openstack_dashboard/dashboards/admin/flavors/tests.py
  16. 1
    1
      openstack_dashboard/dashboards/admin/flavors/views.py
  17. 1
    1
      openstack_dashboard/dashboards/admin/floating_ips/forms.py
  18. 1
    1
      openstack_dashboard/dashboards/admin/floating_ips/tests.py
  19. 2
    2
      openstack_dashboard/dashboards/admin/floating_ips/views.py
  20. 1
    1
      openstack_dashboard/dashboards/admin/hypervisors/compute/forms.py
  21. 1
    1
      openstack_dashboard/dashboards/admin/hypervisors/compute/tests.py
  22. 2
    2
      openstack_dashboard/dashboards/admin/hypervisors/compute/views.py
  23. 1
    1
      openstack_dashboard/dashboards/admin/hypervisors/tests.py
  24. 1
    1
      openstack_dashboard/dashboards/admin/images/tests.py
  25. 2
    2
      openstack_dashboard/dashboards/admin/images/views.py
  26. 3
    3
      openstack_dashboard/dashboards/admin/info/tables.py
  27. 1
    1
      openstack_dashboard/dashboards/admin/info/tests.py
  28. 1
    1
      openstack_dashboard/dashboards/admin/instances/forms.py
  29. 3
    3
      openstack_dashboard/dashboards/admin/instances/tables.py
  30. 1
    1
      openstack_dashboard/dashboards/admin/instances/tests.py
  31. 2
    2
      openstack_dashboard/dashboards/admin/instances/views.py
  32. 1
    1
      openstack_dashboard/dashboards/admin/metadata_defs/forms.py
  33. 1
    1
      openstack_dashboard/dashboards/admin/metadata_defs/tests.py
  34. 2
    2
      openstack_dashboard/dashboards/admin/metadata_defs/views.py
  35. 1
    1
      openstack_dashboard/dashboards/admin/networks/agents/forms.py
  36. 1
    1
      openstack_dashboard/dashboards/admin/networks/agents/tables.py
  37. 1
    1
      openstack_dashboard/dashboards/admin/networks/agents/tests.py
  38. 1
    1
      openstack_dashboard/dashboards/admin/networks/agents/views.py
  39. 1
    1
      openstack_dashboard/dashboards/admin/networks/forms.py
  40. 1
    1
      openstack_dashboard/dashboards/admin/networks/ports/tables.py
  41. 1
    1
      openstack_dashboard/dashboards/admin/networks/ports/tests.py
  42. 1
    1
      openstack_dashboard/dashboards/admin/networks/ports/views.py
  43. 1
    1
      openstack_dashboard/dashboards/admin/networks/ports/workflows.py
  44. 2
    2
      openstack_dashboard/dashboards/admin/networks/subnets/tables.py
  45. 1
    1
      openstack_dashboard/dashboards/admin/networks/subnets/tests.py
  46. 1
    1
      openstack_dashboard/dashboards/admin/networks/subnets/views.py
  47. 1
    1
      openstack_dashboard/dashboards/admin/networks/subnets/workflows.py
  48. 1
    1
      openstack_dashboard/dashboards/admin/networks/tests.py
  49. 1
    1
      openstack_dashboard/dashboards/admin/networks/views.py
  50. 1
    1
      openstack_dashboard/dashboards/admin/networks/workflows.py
  51. 1
    1
      openstack_dashboard/dashboards/admin/overview/tests.py
  52. 1
    1
      openstack_dashboard/dashboards/admin/routers/forms.py
  53. 1
    1
      openstack_dashboard/dashboards/admin/routers/tests.py
  54. 1
    1
      openstack_dashboard/dashboards/admin/routers/views.py
  55. 1
    1
      openstack_dashboard/dashboards/admin/snapshots/forms.py
  56. 1
    1
      openstack_dashboard/dashboards/admin/snapshots/tabs.py
  57. 1
    1
      openstack_dashboard/dashboards/admin/snapshots/tests.py
  58. 2
    2
      openstack_dashboard/dashboards/admin/snapshots/views.py
  59. 1
    1
      openstack_dashboard/dashboards/admin/volume_types/extras/forms.py
  60. 1
    1
      openstack_dashboard/dashboards/admin/volume_types/extras/tables.py
  61. 1
    1
      openstack_dashboard/dashboards/admin/volume_types/extras/tests.py
  62. 2
    2
      openstack_dashboard/dashboards/admin/volume_types/extras/views.py
  63. 1
    1
      openstack_dashboard/dashboards/admin/volume_types/forms.py
  64. 1
    1
      openstack_dashboard/dashboards/admin/volume_types/qos_specs/forms.py
  65. 1
    1
      openstack_dashboard/dashboards/admin/volume_types/qos_specs/tables.py
  66. 1
    1
      openstack_dashboard/dashboards/admin/volume_types/qos_specs/tests.py
  67. 1
    1
      openstack_dashboard/dashboards/admin/volume_types/qos_specs/views.py
  68. 1
    1
      openstack_dashboard/dashboards/admin/volume_types/tables.py
  69. 1
    1
      openstack_dashboard/dashboards/admin/volume_types/tests.py
  70. 2
    2
      openstack_dashboard/dashboards/admin/volume_types/views.py
  71. 1
    1
      openstack_dashboard/dashboards/admin/volumes/forms.py
  72. 1
    1
      openstack_dashboard/dashboards/admin/volumes/tests.py
  73. 2
    2
      openstack_dashboard/dashboards/admin/volumes/views.py
  74. 1
    1
      openstack_dashboard/dashboards/identity/domains/tables.py
  75. 1
    1
      openstack_dashboard/dashboards/identity/domains/tests.py
  76. 1
    1
      openstack_dashboard/dashboards/identity/domains/views.py
  77. 1
    1
      openstack_dashboard/dashboards/identity/domains/workflows.py
  78. 1
    1
      openstack_dashboard/dashboards/identity/groups/tables.py
  79. 1
    1
      openstack_dashboard/dashboards/identity/groups/tests.py
  80. 2
    2
      openstack_dashboard/dashboards/identity/groups/views.py
  81. 1
    1
      openstack_dashboard/dashboards/identity/identity_providers/protocols/tables.py
  82. 1
    1
      openstack_dashboard/dashboards/identity/identity_providers/protocols/tests.py
  83. 1
    1
      openstack_dashboard/dashboards/identity/identity_providers/protocols/views.py
  84. 1
    1
      openstack_dashboard/dashboards/identity/identity_providers/tests.py
  85. 2
    2
      openstack_dashboard/dashboards/identity/identity_providers/views.py
  86. 1
    1
      openstack_dashboard/dashboards/identity/mappings/tests.py
  87. 2
    2
      openstack_dashboard/dashboards/identity/mappings/views.py
  88. 1
    1
      openstack_dashboard/dashboards/identity/projects/tables.py
  89. 1
    1
      openstack_dashboard/dashboards/identity/projects/tests.py
  90. 1
    1
      openstack_dashboard/dashboards/identity/projects/views.py
  91. 1
    1
      openstack_dashboard/dashboards/identity/projects/workflows.py
  92. 1
    1
      openstack_dashboard/dashboards/identity/roles/tests.py
  93. 2
    2
      openstack_dashboard/dashboards/identity/roles/views.py
  94. 1
    1
      openstack_dashboard/dashboards/identity/users/tests.py
  95. 2
    2
      openstack_dashboard/dashboards/identity/users/views.py
  96. 1
    1
      openstack_dashboard/dashboards/project/api_access/tests.py
  97. 1
    1
      openstack_dashboard/dashboards/project/api_access/views.py
  98. 1
    1
      openstack_dashboard/dashboards/project/backups/forms.py
  99. 1
    1
      openstack_dashboard/dashboards/project/backups/tables.py
  100. 0
    0
      openstack_dashboard/dashboards/project/backups/tabs.py

+ 1
- 1
horizon/base.py View File

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

+ 5
- 5
horizon/forms/fields.py View File

@@ -21,12 +21,12 @@ import six
21 21
 from oslo_utils import uuidutils
22 22
 
23 23
 from django.core.exceptions import ValidationError
24
-from django.core import urlresolvers
25 24
 from django.forms import fields
26 25
 from django.forms import forms
27 26
 from django.forms.utils import flatatt
28 27
 from django.forms import widgets
29 28
 from django.template.loader import get_template
29
+from django import urls
30 30
 from django.utils.encoding import force_text
31 31
 from django.utils.encoding import python_2_unicode_compatible
32 32
 from django.utils.functional import Promise
@@ -364,11 +364,11 @@ class DynamicSelectWidget(SelectWidget):
364 364
             return self.add_item_link()
365 365
         try:
366 366
             if self.add_item_link_args:
367
-                return urlresolvers.reverse(self.add_item_link,
368
-                                            args=self.add_item_link_args)
367
+                return urls.reverse(self.add_item_link,
368
+                                    args=self.add_item_link_args)
369 369
             else:
370
-                return urlresolvers.reverse(self.add_item_link)
371
-        except urlresolvers.NoReverseMatch:
370
+                return urls.reverse(self.add_item_link)
371
+        except urls.NoReverseMatch:
372 372
             return self.add_item_link
373 373
 
374 374
 

+ 4
- 4
horizon/tables/actions.py View File

@@ -20,9 +20,9 @@ import logging
20 20
 import types
21 21
 
22 22
 from django.conf import settings
23
-from django.core import urlresolvers
24 23
 from django import shortcuts
25 24
 from django.template.loader import render_to_string
25
+from django import urls
26 26
 from django.utils.functional import Promise
27 27
 from django.utils.http import urlencode
28 28
 from django.utils.translation import ugettext_lazy as _
@@ -406,10 +406,10 @@ class LinkAction(BaseAction):
406 406
         try:
407 407
             if datum:
408 408
                 obj_id = self.table.get_object_id(datum)
409
-                return urlresolvers.reverse(self.url, args=(obj_id,))
409
+                return urls.reverse(self.url, args=(obj_id,))
410 410
             else:
411
-                return urlresolvers.reverse(self.url)
412
-        except urlresolvers.NoReverseMatch as ex:
411
+                return urls.reverse(self.url)
412
+        except urls.NoReverseMatch as ex:
413 413
             LOG.info('No reverse found for "%(url)s": %(exception)s',
414 414
                      {'url': self.url, 'exception': ex})
415 415
             return self.url

+ 3
- 3
horizon/tables/base.py View File

@@ -22,13 +22,13 @@ import sys
22 22
 
23 23
 from django.conf import settings
24 24
 from django.core import exceptions as core_exceptions
25
-from django.core import urlresolvers
26 25
 from django import forms
27 26
 from django.http import HttpResponse
28 27
 from django import template
29 28
 from django.template.defaultfilters import slugify
30 29
 from django.template.defaultfilters import truncatechars
31 30
 from django.template.loader import render_to_string
31
+from django import urls
32 32
 from django.utils.html import escape
33 33
 from django.utils import http
34 34
 from django.utils.http import urlencode
@@ -471,8 +471,8 @@ class Column(html.HTMLElement):
471 471
                 return self.link(datum, request=self.table.request)
472 472
             return self.link(datum)
473 473
         try:
474
-            return urlresolvers.reverse(self.link, args=(obj_id,))
475
-        except urlresolvers.NoReverseMatch:
474
+            return urls.reverse(self.link, args=(obj_id,))
475
+        except urls.NoReverseMatch:
476 476
             return self.link
477 477
 
478 478
     if getattr(settings, 'INTEGRATION_TESTS_SUPPORT', False):

+ 1
- 1
horizon/templatetags/branding.py View File

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

+ 1
- 1
horizon/test/unit/tables/test_tables.py View File

@@ -18,12 +18,12 @@
18 18
 import unittest
19 19
 import uuid
20 20
 
21
-from django.core.urlresolvers import reverse
22 21
 from django import forms
23 22
 from django import http
24 23
 from django import shortcuts
25 24
 from django.template import defaultfilters
26 25
 from django.test.utils import override_settings
26
+from django.urls import reverse
27 27
 from django.utils.translation import ungettext_lazy
28 28
 
29 29
 import mock

+ 3
- 3
horizon/test/unit/test_base.py View File

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

+ 3
- 3
horizon/workflows/base.py View File

@@ -17,13 +17,13 @@ from importlib import import_module
17 17
 import inspect
18 18
 import logging
19 19
 
20
-from django.core import urlresolvers
21 20
 from django import forms
22 21
 from django.forms.forms import NON_FIELD_ERRORS
23 22
 from django import template
24 23
 from django.template.defaultfilters import linebreaks
25 24
 from django.template.defaultfilters import safe
26 25
 from django.template.defaultfilters import slugify
26
+from django import urls
27 27
 from django.utils.encoding import force_text
28 28
 from django.utils.translation import ugettext_lazy as _
29 29
 from openstack_auth import policy
@@ -858,8 +858,8 @@ class Workflow(html.HTMLElement):
858 858
         or a standard HTTP URL.
859 859
         """
860 860
         try:
861
-            return urlresolvers.reverse(self.success_url)
862
-        except urlresolvers.NoReverseMatch:
861
+            return urls.reverse(self.success_url)
862
+        except urls.NoReverseMatch:
863 863
             return self.success_url
864 864
 
865 865
     def format_status_message(self, message):

+ 1
- 1
openstack_auth/tests/unit/test_auth.py View File

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

+ 1
- 1
openstack_dashboard/contrib/developer/profiler/middleware.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/aggregates/tests.py View File

@@ -12,8 +12,8 @@
12 12
 
13 13
 import mock
14 14
 
15
-from django.core.urlresolvers import reverse
16 15
 from django import http
16
+from django.urls import reverse
17 17
 from django.utils import html
18 18
 from mox3.mox import IsA
19 19
 

+ 1
- 1
openstack_dashboard/dashboards/admin/aggregates/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/defaults/tests.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/flavors/tables.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/flavors/tests.py View File

@@ -12,8 +12,8 @@
12 12
 
13 13
 import django
14 14
 from django.conf import settings
15
-from django.core.urlresolvers import reverse
16 15
 from django import http
16
+from django.urls import reverse
17 17
 from mox3.mox import IsA
18 18
 from novaclient.v2 import flavors
19 19
 

+ 1
- 1
openstack_dashboard/dashboards/admin/flavors/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/floating_ips/forms.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/floating_ips/tests.py View File

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

+ 2
- 2
openstack_dashboard/dashboards/admin/floating_ips/views.py View File

@@ -15,8 +15,8 @@
15 15
 
16 16
 from collections import OrderedDict
17 17
 
18
-from django.core.urlresolvers import reverse
19
-from django.core.urlresolvers import reverse_lazy
18
+from django.urls import reverse
19
+from django.urls import reverse_lazy
20 20
 from django.utils.translation import ugettext_lazy as _
21 21
 import netaddr
22 22
 

+ 1
- 1
openstack_dashboard/dashboards/admin/hypervisors/compute/forms.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/hypervisors/compute/tests.py View File

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

+ 2
- 2
openstack_dashboard/dashboards/admin/hypervisors/compute/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/hypervisors/tests.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/images/tests.py View File

@@ -13,8 +13,8 @@
13 13
 #    under the License.
14 14
 
15 15
 from django.conf import settings
16
-from django.core.urlresolvers import reverse
17 16
 from django.test.utils import override_settings
17
+from django.urls import reverse
18 18
 
19 19
 import mock
20 20
 

+ 2
- 2
openstack_dashboard/dashboards/admin/images/views.py View File

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

+ 3
- 3
openstack_dashboard/dashboards/admin/info/tables.py View File

@@ -11,9 +11,9 @@
11 11
 # under the License.
12 12
 
13 13
 from django.conf import settings
14
-from django.core import urlresolvers
15 14
 from django import template
16 15
 from django.template import defaultfilters as filters
16
+from django import urls
17 17
 from django.utils.translation import pgettext_lazy
18 18
 from django.utils.translation import ugettext_lazy as _
19 19
 
@@ -196,8 +196,8 @@ class NetworkL3AgentRoutersLinkAction(tables.LinkAction):
196 196
 
197 197
     def get_link_url(self, datum=None):
198 198
         obj_id = datum.id
199
-        return urlresolvers.reverse("horizon:admin:routers:l3_agent_list",
200
-                                    args=(obj_id,))
199
+        return urls.reverse("horizon:admin:routers:l3_agent_list",
200
+                            args=(obj_id,))
201 201
 
202 202
 
203 203
 class NetworkAgentsTable(tables.DataTable):

+ 1
- 1
openstack_dashboard/dashboards/admin/info/tests.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/instances/forms.py View File

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

+ 3
- 3
openstack_dashboard/dashboards/admin/instances/tables.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/instances/tests.py View File

@@ -15,8 +15,8 @@
15 15
 from collections import OrderedDict
16 16
 import uuid
17 17
 
18
-from django.core.urlresolvers import reverse
19 18
 from django import http
19
+from django.urls import reverse
20 20
 
21 21
 from mox3.mox import IsA
22 22
 

+ 2
- 2
openstack_dashboard/dashboards/admin/instances/views.py View File

@@ -20,8 +20,8 @@
20 20
 import futurist
21 21
 
22 22
 from django.conf import settings
23
-from django.core.urlresolvers import reverse
24
-from django.core.urlresolvers import reverse_lazy
23
+from django.urls import reverse
24
+from django.urls import reverse_lazy
25 25
 from django.utils.translation import ugettext_lazy as _
26 26
 
27 27
 from horizon import exceptions

+ 1
- 1
openstack_dashboard/dashboards/admin/metadata_defs/forms.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/metadata_defs/tests.py View File

@@ -16,8 +16,8 @@
16 16
 
17 17
 import json
18 18
 
19
-from django.core.urlresolvers import reverse
20 19
 from django import http
20
+from django.urls import reverse
21 21
 
22 22
 from mox3.mox import IsA
23 23
 import six

+ 2
- 2
openstack_dashboard/dashboards/admin/metadata_defs/views.py View File

@@ -14,8 +14,8 @@
14 14
 
15 15
 import json
16 16
 
17
-from django.core.urlresolvers import reverse
18
-from django.core.urlresolvers import reverse_lazy
17
+from django.urls import reverse
18
+from django.urls import reverse_lazy
19 19
 from django.utils.translation import ugettext_lazy as _
20 20
 
21 21
 from horizon import exceptions

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/agents/forms.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/agents/tables.py View File

@@ -14,8 +14,8 @@
14 14
 
15 15
 import logging
16 16
 
17
-from django.core.urlresolvers import reverse
18 17
 from django.template import defaultfilters as filters
18
+from django.urls import reverse
19 19
 from django.utils.translation import ugettext_lazy as _
20 20
 from django.utils.translation import ungettext_lazy
21 21
 

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/agents/tests.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/agents/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/forms.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/ports/tables.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/ports/tests.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/ports/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/ports/workflows.py View File

@@ -15,7 +15,7 @@
15 15
 
16 16
 import logging
17 17
 
18
-from django.core.urlresolvers import reverse
18
+from django.urls import reverse
19 19
 from django.utils.translation import ugettext_lazy as _
20 20
 
21 21
 from horizon import forms

+ 2
- 2
openstack_dashboard/dashboards/admin/networks/subnets/tables.py View File

@@ -14,8 +14,8 @@
14 14
 
15 15
 import logging
16 16
 
17
-from django.core.urlresolvers import reverse
18
-from django.core.urlresolvers import reverse_lazy
17
+from django.urls import reverse
18
+from django.urls import reverse_lazy
19 19
 from django.utils.translation import ugettext_lazy as _
20 20
 
21 21
 from horizon import exceptions

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/subnets/tests.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/subnets/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/subnets/workflows.py View File

@@ -14,7 +14,7 @@
14 14
 
15 15
 import logging
16 16
 
17
-from django.core.urlresolvers import reverse
17
+from django.urls import reverse
18 18
 from django.utils.translation import ugettext_lazy as _
19 19
 
20 20
 from horizon import exceptions

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/tests.py View File

@@ -13,8 +13,8 @@
13 13
 #    under the License.
14 14
 
15 15
 
16
-from django.core.urlresolvers import reverse
17 16
 from django import http
17
+from django.urls import reverse
18 18
 from django.utils.http import urlunquote
19 19
 
20 20
 from mox3.mox import IsA

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/networks/workflows.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/overview/tests.py View File

@@ -18,9 +18,9 @@
18 18
 
19 19
 import datetime
20 20
 
21
-from django.core.urlresolvers import reverse
22 21
 from django import http
23 22
 from django.test.utils import override_settings
23
+from django.urls import reverse
24 24
 from django.utils import encoding
25 25
 from django.utils import timezone
26 26
 

+ 1
- 1
openstack_dashboard/dashboards/admin/routers/forms.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/routers/tests.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/routers/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/snapshots/forms.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/snapshots/tabs.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/snapshots/tests.py View File

@@ -11,9 +11,9 @@
11 11
 # under the License.
12 12
 
13 13
 from django.conf import settings
14
-from django.core.urlresolvers import reverse
15 14
 from django import http
16 15
 from django.test.utils import override_settings
16
+from django.urls import reverse
17 17
 from django.utils.http import urlunquote
18 18
 from mox3.mox import IsA
19 19
 

+ 2
- 2
openstack_dashboard/dashboards/admin/snapshots/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/volume_types/extras/forms.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/volume_types/extras/tables.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/volume_types/extras/tests.py View File

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

+ 2
- 2
openstack_dashboard/dashboards/admin/volume_types/extras/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/volume_types/forms.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/volume_types/qos_specs/forms.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/volume_types/qos_specs/tables.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/volume_types/qos_specs/tests.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/volume_types/qos_specs/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/volume_types/tables.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/volume_types/tests.py View File

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

+ 2
- 2
openstack_dashboard/dashboards/admin/volume_types/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/volumes/forms.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/admin/volumes/tests.py View File

@@ -15,8 +15,8 @@
15 15
 import copy
16 16
 
17 17
 from django.conf import settings
18
-from django.core.urlresolvers import reverse
19 18
 from django.test.utils import override_settings
19
+from django.urls import reverse
20 20
 from django.utils.http import urlunquote
21 21
 import mock
22 22
 

+ 2
- 2
openstack_dashboard/dashboards/admin/volumes/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/identity/domains/tables.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/identity/domains/tests.py View File

@@ -13,8 +13,8 @@
13 13
 #    under the License.
14 14
 
15 15
 
16
-from django.core.urlresolvers import reverse
17 16
 from django import http
17
+from django.urls import reverse
18 18
 
19 19
 from mox3.mox import IgnoreArg
20 20
 from mox3.mox import IsA

+ 1
- 1
openstack_dashboard/dashboards/identity/domains/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/identity/domains/workflows.py View File

@@ -15,7 +15,7 @@
15 15
 import logging
16 16
 
17 17
 from django.conf import settings
18
-from django.core.urlresolvers import reverse
18
+from django.urls import reverse
19 19
 from django.utils.translation import ugettext_lazy as _
20 20
 
21 21
 from openstack_auth import utils

+ 1
- 1
openstack_dashboard/dashboards/identity/groups/tables.py View File

@@ -14,8 +14,8 @@
14 14
 
15 15
 import logging
16 16
 
17
-from django.core.urlresolvers import reverse
18 17
 from django.template import defaultfilters
18
+from django.urls import reverse
19 19
 from django.utils.translation import ugettext_lazy as _
20 20
 from django.utils.translation import ungettext_lazy
21 21
 

+ 1
- 1
openstack_dashboard/dashboards/identity/groups/tests.py View File

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

+ 2
- 2
openstack_dashboard/dashboards/identity/groups/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/identity/identity_providers/protocols/tables.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/identity/identity_providers/protocols/tests.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/identity/identity_providers/protocols/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/identity/identity_providers/tests.py View File

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

+ 2
- 2
openstack_dashboard/dashboards/identity/identity_providers/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/identity/mappings/tests.py View File

@@ -14,8 +14,8 @@
14 14
 
15 15
 import json
16 16
 
17
-from django.core.urlresolvers import reverse
18 17
 from django import http
18
+from django.urls import reverse
19 19
 
20 20
 from mox3.mox import IgnoreArg
21 21
 from mox3.mox import IsA

+ 2
- 2
openstack_dashboard/dashboards/identity/mappings/views.py View File

@@ -14,8 +14,8 @@
14 14
 
15 15
 import json
16 16
 
17
-from django.core.urlresolvers import reverse
18
-from django.core.urlresolvers import reverse_lazy
17
+from django.urls import reverse
18
+from django.urls import reverse_lazy
19 19
 from django.utils.translation import ugettext_lazy as _
20 20
 
21 21
 from horizon import exceptions

+ 1
- 1
openstack_dashboard/dashboards/identity/projects/tables.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/identity/projects/tests.py View File

@@ -18,9 +18,9 @@ import os
18 18
 import unittest
19 19
 
20 20
 import django
21
-from django.core.urlresolvers import reverse
22 21
 from django import http
23 22
 from django.test.utils import override_settings
23
+from django.urls import reverse
24 24
 from django.utils import timezone
25 25
 
26 26
 from mox3.mox import IgnoreArg

+ 1
- 1
openstack_dashboard/dashboards/identity/projects/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/identity/projects/workflows.py View File

@@ -19,7 +19,7 @@
19 19
 import logging
20 20
 
21 21
 from django.conf import settings
22
-from django.core.urlresolvers import reverse
22
+from django.urls import reverse
23 23
 from django.utils.translation import ugettext_lazy as _
24 24
 
25 25
 from openstack_auth import utils

+ 1
- 1
openstack_dashboard/dashboards/identity/roles/tests.py View File

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

+ 2
- 2
openstack_dashboard/dashboards/identity/roles/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/identity/users/tests.py View File

@@ -19,9 +19,9 @@
19 19
 from socket import timeout as socket_timeout
20 20
 
21 21
 import django
22
-from django.core.urlresolvers import reverse
23 22
 from django import http
24 23
 from django.test.utils import override_settings
24
+from django.urls import reverse
25 25
 
26 26
 from mox3.mox import IgnoreArg
27 27
 from mox3.mox import IsA

+ 2
- 2
openstack_dashboard/dashboards/identity/users/views.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/project/api_access/tests.py View File

@@ -16,11 +16,11 @@ from mox3.mox import IsA
16 16
 import six
17 17
 import yaml
18 18
 
19
-from django.core.urlresolvers import reverse
20 19
 from django.http import HttpRequest
21 20
 from django import template
22 21
 from django.template import loader
23 22
 from django.test.utils import override_settings
23
+from django.urls import reverse
24 24
 
25 25
 from openstack_dashboard import api
26 26
 from openstack_dashboard.test import helpers as test

+ 1
- 1
openstack_dashboard/dashboards/project/api_access/views.py View File

@@ -18,10 +18,10 @@ import tempfile
18 18
 import zipfile
19 19
 
20 20
 from django.conf import settings
21
-from django.core.urlresolvers import reverse_lazy
22 21
 from django import http
23 22
 from django import shortcuts
24 23
 from django.template.loader import render_to_string
24
+from django.urls import reverse_lazy
25 25
 from django.utils.translation import ugettext_lazy as _
26 26
 
27 27
 from openstack_auth import utils

+ 1
- 1
openstack_dashboard/dashboards/project/backups/forms.py View File

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

+ 1
- 1
openstack_dashboard/dashboards/project/backups/tables.py View File

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

+ 0
- 0
openstack_dashboard/dashboards/project/backups/tabs.py View File


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

Loading…
Cancel
Save