From eaeb997abd1d967dcff6cfa514ac3b7706422562 Mon Sep 17 00:00:00 2001 From: Adrian Czarnecki Date: Wed, 12 Jul 2017 14:13:31 +0200 Subject: [PATCH] Fix incorrect django.conf.url patterns import Remove Django patterns from code. Patterns from django.conf.urls has been removed in Django 1.10. Current Django version in devstack is 1.10.7 Remove global_settings.TEMPLATE_CONTEXT_PROCESSORS because this variable has been removed in Django 1.10. Story: 2001120 Task: 4811 Change-Id: I84a4aceb73abd37dab4acf43b9abf8b43c7f1625 --- monitoring/alarmdefs/urls.py | 8 +++----- monitoring/alarms/urls.py | 9 +++------ monitoring/notifications/urls.py | 9 +++------ monitoring/overview/urls.py | 9 +++------ monitoring/test/settings.py | 5 ----- monitoring/test/urls.py | 5 ++--- 6 files changed, 14 insertions(+), 31 deletions(-) diff --git a/monitoring/alarmdefs/urls.py b/monitoring/alarmdefs/urls.py index 7e949aa0..af195522 100644 --- a/monitoring/alarmdefs/urls.py +++ b/monitoring/alarmdefs/urls.py @@ -11,13 +11,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa from django.conf.urls import url # noqa from monitoring.alarmdefs import views -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), url(r'^alarm/create$', views.AlarmCreateView.as_view(), @@ -27,5 +25,5 @@ urlpatterns = patterns( name='alarm_detail'), url(r'^alarm/(?P[^/]+)/alarm_edit/$', views.AlarmEditView.as_view(), - name='alarm_edit'), -) + name='alarm_edit') +] diff --git a/monitoring/alarms/urls.py b/monitoring/alarms/urls.py index 05af3470..5a0560c8 100644 --- a/monitoring/alarms/urls.py +++ b/monitoring/alarms/urls.py @@ -11,13 +11,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from django.conf.urls import patterns # noqa from django.conf.urls import url # noqa from monitoring.alarms import views -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), url(r'^alarm/filter/$', views.AlarmFilterView.as_view(), @@ -30,6 +28,5 @@ urlpatterns = patterns( name='alarm_all'), url(r'^history/(?P[^/]+)/(?P[^/]+)$', views.AlarmHistoryView.as_view(), - name='history'), - -) + name='history') +] diff --git a/monitoring/notifications/urls.py b/monitoring/notifications/urls.py index 61a71a33..eb3ad663 100644 --- a/monitoring/notifications/urls.py +++ b/monitoring/notifications/urls.py @@ -11,19 +11,16 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -from django.conf.urls import patterns # noqa from django.conf.urls import url # noqa from monitoring.notifications import views -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), url(r'^notification_create$', views.NotificationCreateView.as_view(), name='notification_create'), url(r'^notification_edit/(?P[^/]+)$', views.NotificationEditView.as_view(), - name='notification_edit'), -) + name='notification_edit') +] diff --git a/monitoring/overview/urls.py b/monitoring/overview/urls.py index c95b576b..d22d918a 100644 --- a/monitoring/overview/urls.py +++ b/monitoring/overview/urls.py @@ -11,16 +11,13 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -from django.conf.urls import patterns # noqa from django.conf.urls import url # noqa from monitoring.overview import views from monitoring.config import local_settings as settings -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), url(r'^status', views.StatusView.as_view(), name='status'), url(r'^proxy\/(?P.*)$', views.MonascaProxyView.as_view()), @@ -28,5 +25,5 @@ urlpatterns = patterns( url(r'^logs_proxy(?P.*)$', views.KibanaProxyView.as_view( base_url=settings.KIBANA_HOST), name='kibana_proxy' - ), -) + ) +] diff --git a/monitoring/test/settings.py b/monitoring/test/settings.py index 3067f0b1..78dc942c 100644 --- a/monitoring/test/settings.py +++ b/monitoring/test/settings.py @@ -13,7 +13,6 @@ import os -from django.conf import global_settings from django.utils.translation import ugettext_lazy as _ # noqa from horizon.test.settings import * # noqa @@ -26,10 +25,6 @@ TEMPLATE_DIRS = ( os.path.join(TEST_DIR, 'templates'), ) -TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + [ - 'openstack_dashboard.context_processors.openstack', -] - INSTALLED_APPS = ( 'django.contrib.contenttypes', 'django.contrib.auth', diff --git a/monitoring/test/urls.py b/monitoring/test/urls.py index 4e6e290f..08a82793 100644 --- a/monitoring/test/urls.py +++ b/monitoring/test/urls.py @@ -16,12 +16,11 @@ from django.views import generic import openstack_dashboard.urls -urlpatterns = urls.patterns( - '', +urlpatterns = [ urls.url( r'^qunit_tuskar', generic.TemplateView.as_view( template_name="infrastructure/qunit.html"), name='qunit_tests'), urls.url(r'', urls.include(openstack_dashboard.urls)) -) +]