Add support for Django 1.6
The django.conf.urls.defaults module has been removed in Django 1.6. The functions include(), patterns() and url() plus handler404, handler500, are now available through django.conf.urls. https://docs.djangoproject.com/en/dev/internals/deprecation/ Change-Id: I8d9265e1455d0111edf7596552fa00a3d0b2a97c Closes-Bug: #1291953
This commit is contained in:
parent
c712aa477d
commit
2dfd0df3e3
|
@ -14,10 +14,14 @@
|
|||
# limitations under the License.
|
||||
|
||||
|
||||
from django.conf.urls.defaults import patterns
|
||||
from django.conf.urls.defaults import url
|
||||
|
||||
import saharadashboard.cluster_templates.views as views
|
||||
from saharadashboard.utils import importutils
|
||||
|
||||
urls = importutils.import_any('django.conf.urls.defaults',
|
||||
'django.conf.urls')
|
||||
patterns = urls.patterns
|
||||
url = urls.url
|
||||
|
||||
|
||||
urlpatterns = patterns('',
|
||||
url(r'^$', views.ClusterTemplatesView.as_view(),
|
||||
|
|
|
@ -14,10 +14,14 @@
|
|||
# limitations under the License.
|
||||
|
||||
|
||||
from django.conf.urls.defaults import patterns
|
||||
from django.conf.urls.defaults import url
|
||||
|
||||
import saharadashboard.clusters.views as views
|
||||
from saharadashboard.utils import importutils
|
||||
|
||||
urls = importutils.import_any('django.conf.urls.defaults',
|
||||
'django.conf.urls')
|
||||
patterns = urls.patterns
|
||||
url = urls.url
|
||||
|
||||
|
||||
urlpatterns = patterns('',
|
||||
url(r'^$', views.ClustersView.as_view(),
|
||||
|
|
|
@ -14,10 +14,14 @@
|
|||
# limitations under the License.
|
||||
|
||||
|
||||
from django.conf.urls.defaults import patterns
|
||||
from django.conf.urls.defaults import url
|
||||
|
||||
import saharadashboard.data_sources.views as views
|
||||
from saharadashboard.utils import importutils
|
||||
|
||||
urls = importutils.import_any('django.conf.urls.defaults',
|
||||
'django.conf.urls')
|
||||
patterns = urls.patterns
|
||||
url = urls.url
|
||||
|
||||
|
||||
urlpatterns = patterns('',
|
||||
url(r'^$', views.DataSourcesView.as_view(),
|
||||
|
|
|
@ -14,11 +14,16 @@
|
|||
# limitations under the License.
|
||||
|
||||
|
||||
from django.conf.urls.defaults import patterns
|
||||
from django.conf.urls.defaults import url
|
||||
from saharadashboard.image_registry.views import EditTagsView
|
||||
from saharadashboard.image_registry.views import ImageRegistryView
|
||||
from saharadashboard.image_registry.views import RegisterImageView
|
||||
from saharadashboard.utils import importutils
|
||||
|
||||
urls = importutils.import_any('django.conf.urls.defaults',
|
||||
'django.conf.urls')
|
||||
patterns = urls.patterns
|
||||
url = urls.url
|
||||
|
||||
|
||||
urlpatterns = patterns('',
|
||||
url(r'^$', ImageRegistryView.as_view(),
|
||||
|
|
|
@ -14,10 +14,14 @@
|
|||
# limitations under the License.
|
||||
|
||||
|
||||
from django.conf.urls.defaults import patterns
|
||||
from django.conf.urls.defaults import url
|
||||
|
||||
import saharadashboard.job_binaries.views as views
|
||||
from saharadashboard.utils import importutils
|
||||
|
||||
urls = importutils.import_any('django.conf.urls.defaults',
|
||||
'django.conf.urls')
|
||||
patterns = urls.patterns
|
||||
url = urls.url
|
||||
|
||||
|
||||
urlpatterns = patterns('',
|
||||
url(r'^$', views.JobBinariesView.as_view(),
|
||||
|
|
|
@ -14,11 +14,14 @@
|
|||
# limitations under the License.
|
||||
|
||||
|
||||
from django.conf.urls.defaults import patterns
|
||||
from django.conf.urls.defaults import url
|
||||
|
||||
import saharadashboard.job_executions.views as views
|
||||
from saharadashboard.jobs import views as job_views
|
||||
from saharadashboard.utils import importutils
|
||||
|
||||
urls = importutils.import_any('django.conf.urls.defaults',
|
||||
'django.conf.urls')
|
||||
patterns = urls.patterns
|
||||
url = urls.url
|
||||
|
||||
|
||||
urlpatterns = patterns('',
|
||||
|
|
|
@ -14,10 +14,14 @@
|
|||
# limitations under the License.
|
||||
|
||||
|
||||
from django.conf.urls.defaults import patterns
|
||||
from django.conf.urls.defaults import url
|
||||
|
||||
import saharadashboard.jobs.views as views
|
||||
from saharadashboard.utils import importutils
|
||||
|
||||
urls = importutils.import_any('django.conf.urls.defaults',
|
||||
'django.conf.urls')
|
||||
patterns = urls.patterns
|
||||
url = urls.url
|
||||
|
||||
|
||||
urlpatterns = patterns('',
|
||||
url(r'^$', views.JobsView.as_view(),
|
||||
|
|
|
@ -14,10 +14,14 @@
|
|||
# limitations under the License.
|
||||
|
||||
|
||||
from django.conf.urls.defaults import patterns
|
||||
from django.conf.urls.defaults import url
|
||||
|
||||
import saharadashboard.nodegroup_templates.views as views
|
||||
from saharadashboard.utils import importutils
|
||||
|
||||
urls = importutils.import_any('django.conf.urls.defaults',
|
||||
'django.conf.urls')
|
||||
patterns = urls.patterns
|
||||
url = urls.url
|
||||
|
||||
|
||||
urlpatterns = patterns('savanna.nodegroup_templates.views',
|
||||
url(r'^$', views.NodegroupTemplatesView.as_view(),
|
||||
|
|
|
@ -14,11 +14,14 @@
|
|||
# limitations under the License.
|
||||
|
||||
|
||||
from django.conf.urls.defaults import patterns
|
||||
from django.conf.urls.defaults import url
|
||||
|
||||
from saharadashboard.plugins.views import PluginDetailsView
|
||||
from saharadashboard.plugins.views import PluginsView
|
||||
from saharadashboard.utils import importutils
|
||||
|
||||
urls = importutils.import_any('django.conf.urls.defaults',
|
||||
'django.conf.urls')
|
||||
patterns = urls.patterns
|
||||
url = urls.url
|
||||
|
||||
|
||||
urlpatterns = patterns('',
|
||||
|
|
Loading…
Reference in New Issue