openstack/mistral-dashboard
Code Issues Proposed changes

Update URLs to Django 1.8 style

Browse Source 
django.conf.urls.patterns() is deprecated since 1.8.
We should not use patterns(), so this patch updates URLs to
1.8 style.

Change-Id: Ida48baed98da4aeabdfdfc2f02b21bc588311161
Closes-Bug: #1539354
This commit is contained in:
zhangguoqing 2016-01-29 22:51:08 +08:00
parent e9fa1ef7e5
commit 5c622043ab
7 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mistraldashboard/actions/urls.py
View File

@ -12,18 +12,16 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa from django.conf.urls import url # noqa
from mistraldashboard.actions import views from mistraldashboard.actions import views
ACTIONS = r'^(?P<action_name>[^/]+)/%s$' ACTIONS = r'^(?P<action_name>[^/]+)/%s$'
urlpatterns = patterns( urlpatterns = [
'',
url(r'^$', views.IndexView.as_view(), name='index'), url(r'^$', views.IndexView.as_view(), name='index'),
url(ACTIONS % 'detail', views.DetailView.as_view(), name='detail'), url(ACTIONS % 'detail', views.DetailView.as_view(), name='detail'),
url(ACTIONS % 'run', views.RunView.as_view(), name='run'), url(ACTIONS % 'run', views.RunView.as_view(), name='run'),
url(r'^create$', views.CreateView.as_view(), name='create'), url(r'^create$', views.CreateView.as_view(), name='create'),
url(r'^update$', views.UpdateView.as_view(), name='update'), url(r'^update$', views.UpdateView.as_view(), name='update'),
) ]

10
mistraldashboard/cron_triggers/urls.py
View File

@ -12,18 +12,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa from django.conf.urls import url # noqa
from mistraldashboard.cron_triggers import views from mistraldashboard.cron_triggers import views
CRON_TRIGGERS = r'^(?P<cron_trigger_name>[^/]+)/%s$' CRON_TRIGGERS = r'^(?P<cron_trigger_name>[^/]+)/%s$'
urlpatterns = patterns( urlpatterns = [
'',
url(r'^$', views.IndexView.as_view(), name='index'), url(r'^$', views.IndexView.as_view(), name='index'),
url(CRON_TRIGGERS % 'detail', views.OverviewView.as_view(), name='detail'), url(CRON_TRIGGERS % 'detail', views.OverviewView.as_view(), name='detail'),
url(r'^create$', url(r'^create$', views.CreateView.as_view(), name='create'),
views.CreateView.as_view(), ]
name='create'),
)

6
mistraldashboard/executions/urls.py
View File

@ -14,15 +14,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa from django.conf.urls import url # noqa
from mistraldashboard.executions import views from mistraldashboard.executions import views
EXECUTIONS = r'^(?P<execution_id>[^/]+)/%s$' EXECUTIONS = r'^(?P<execution_id>[^/]+)/%s$'
urlpatterns = patterns( urlpatterns = [
'',
url(r'^$', views.IndexView.as_view(), name='index'), url(r'^$', views.IndexView.as_view(), name='index'),
url(EXECUTIONS % 'detail', views.DetailView.as_view(), name='detail'), url(EXECUTIONS % 'detail', views.DetailView.as_view(), name='detail'),
url(EXECUTIONS % 'detail_task_id', views.DetailView.as_view(), url(EXECUTIONS % 'detail_task_id', views.DetailView.as_view(),
@ -34,4 +32,4 @@ urlpatterns = patterns(
url(EXECUTIONS % 'update_description', url(EXECUTIONS % 'update_description',
views.UpdateDescriptionView.as_view(), views.UpdateDescriptionView.as_view(),
name='update_description'), name='update_description'),
) ]

6
mistraldashboard/tasks/urls.py
View File

@ -14,15 +14,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa from django.conf.urls import url # noqa
from mistraldashboard.tasks import views from mistraldashboard.tasks import views
TASKS = r'^(?P<task_id>[^/]+)/%s$' TASKS = r'^(?P<task_id>[^/]+)/%s$'
urlpatterns = patterns( urlpatterns = [
'',
url(r'^$', views.IndexView.as_view(), name='index'), url(r'^$', views.IndexView.as_view(), name='index'),
url(TASKS % 'detail', views.OverviewView.as_view(), name='detail'), url(TASKS % 'detail', views.OverviewView.as_view(), name='detail'),
url(TASKS % 'execution', views.ExecutionView.as_view(), name='execution'), url(TASKS % 'execution', views.ExecutionView.as_view(), name='execution'),
@ -30,4 +28,4 @@ urlpatterns = patterns(
{'column': 'result'}, name='result'), {'column': 'result'}, name='result'),
url(TASKS % 'published', views.CodeView.as_view(), url(TASKS % 'published', views.CodeView.as_view(),
{'column': 'published'}, name='published'), {'column': 'published'}, name='published'),
) ]

5
mistraldashboard/test/urls.py
View File

@ -14,7 +14,6 @@
from django.conf import urls from django.conf import urls
import openstack_dashboard.urls import openstack_dashboard.urls
urlpatterns = urls.patterns( urlpatterns = [
'',
urls.url(r'', urls.include(openstack_dashboard.urls)) urls.url(r'', urls.include(openstack_dashboard.urls))
) ]

6
mistraldashboard/workbooks/urls.py
View File

@ -14,15 +14,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa from django.conf.urls import url # noqa
from mistraldashboard.workbooks import views from mistraldashboard.workbooks import views
WORKBOOKS = r'^(?P<workbook_name>[^/]+)/%s$' WORKBOOKS = r'^(?P<workbook_name>[^/]+)/%s$'
urlpatterns = patterns( urlpatterns = [
'',
url(r'^$', views.IndexView.as_view(), name='index'), url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^select_definition$', url(r'^select_definition$',
views.SelectDefinitionView.as_view(), views.SelectDefinitionView.as_view(),
@ -33,4 +31,4 @@ urlpatterns = patterns(
url(r'^create$', views.CreateView.as_view(), name='create'), url(r'^create$', views.CreateView.as_view(), name='create'),
url(r'^update$', views.UpdateView.as_view(), name='update'), url(r'^update$', views.UpdateView.as_view(), name='update'),
url(WORKBOOKS % 'detail', views.DetailView.as_view(), name='detail'), url(WORKBOOKS % 'detail', views.DetailView.as_view(), name='detail'),
) ]

6
mistraldashboard/workflows/urls.py
View File

@ -14,15 +14,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from django.conf.urls import patterns # noqa
from django.conf.urls import url # noqa from django.conf.urls import url # noqa
from mistraldashboard.workflows import views from mistraldashboard.workflows import views
WORKFLOWS = r'^(?P<workflow_name>[^/]+)/%s$' WORKFLOWS = r'^(?P<workflow_name>[^/]+)/%s$'
urlpatterns = patterns( urlpatterns = [
'',
url(r'^$', views.IndexView.as_view(), name='index'), url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^select_definition$', url(r'^select_definition$',
views.SelectDefinitionView.as_view(), views.SelectDefinitionView.as_view(),
@ -34,4 +32,4 @@ urlpatterns = patterns(
url(r'^update$', views.UpdateView.as_view(), name='update'), url(r'^update$', views.UpdateView.as_view(), name='update'),
url(WORKFLOWS % 'execute', views.ExecuteView.as_view(), name='execute'), url(WORKFLOWS % 'execute', views.ExecuteView.as_view(), name='execute'),
url(WORKFLOWS % 'detail', views.DetailView.as_view(), name='detail'), url(WORKFLOWS % 'detail', views.DetailView.as_view(), name='detail'),
) ]