Fix urls patterns import to be compatible with django 1.6

diff --git a/htsworkflow/frontend/bcmagic/urls.py b/htsworkflow/frontend/bcmagic/urls.py
index 62497d2efdd4a1bdf2c53fdf0919410797aecf15..d5c9627ce701ed4639b9648e548353d6b57b2067 100644 (file)
--- a/htsworkflow/frontend/bcmagic/urls.py
+++ b/htsworkflow/frontend/bcmagic/urls.py
@@ -1,7 +1,7 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns
 
 urlpatterns = patterns('',
     (r'^json_test/$', 'htsworkflow.frontend.bcmagic.views.json_test'),
     (r'^magic/$', 'htsworkflow.frontend.bcmagic.views.magic'),
     (r'^$', 'htsworkflow.frontend.bcmagic.views.index'),
-)
\ No newline at end of file
+)

diff --git a/htsworkflow/frontend/eland_config/urls.py b/htsworkflow/frontend/eland_config/urls.py
index 129f57c87736a3b2558259f13bdfc5dc68344be1..a70940728d9a1e64cdc1dae8599444ca24b95d32 100644 (file)
--- a/htsworkflow/frontend/eland_config/urls.py
+++ b/htsworkflow/frontend/eland_config/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns
 
 urlpatterns = patterns('',
     # Example:

diff --git a/htsworkflow/frontend/experiments/urls.py b/htsworkflow/frontend/experiments/urls.py
index 91202a867bd76bad92dad516d81869ba70c953b3..6a53cdb66c90023127295794fd0fc07abfff130b 100644 (file)
--- a/htsworkflow/frontend/experiments/urls.py
+++ b/htsworkflow/frontend/experiments/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns
 
 urlpatterns = patterns('',
     (r'^$', 'htsworkflow.frontend.experiments.views.index'),

diff --git a/htsworkflow/frontend/inventory/urls.py b/htsworkflow/frontend/inventory/urls.py
index 7269a802343a58b075434976686a930306bb2aff..fc25768cdf25897bd005c8bf74d647963e45d454 100644 (file)
--- a/htsworkflow/frontend/inventory/urls.py
+++ b/htsworkflow/frontend/inventory/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns
 
 urlpatterns = patterns('',
     # DATA

diff --git a/htsworkflow/frontend/reports/urls.py b/htsworkflow/frontend/reports/urls.py
index 5a004f219f3f4eca044f43012c66ffaa0e3e0e24..fa76f83344682464aa866ac9ac2702e7db6b9a16 100644 (file)
--- a/htsworkflow/frontend/reports/urls.py
+++ b/htsworkflow/frontend/reports/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns
 
 urlpatterns = patterns('',                                               
     (r'^updLibInfo$', 'htsworkflow.frontend.reports.libinfopar.refreshLibInfoFile'),

diff --git a/htsworkflow/frontend/samples/urls.py b/htsworkflow/frontend/samples/urls.py
index fea937c69e52fa1117d4d78c2342eb17b9c7f467..bd8a8f6d41301c9ffc827a746984004e11a08fa1 100644 (file)
--- a/htsworkflow/frontend/samples/urls.py
+++ b/htsworkflow/frontend/samples/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns
 
 urlpatterns = patterns('',
     (r"^library/(?P<library_id>\w+)/json", 'htsworkflow.frontend.samples.views.library_json'),

diff --git a/htsworkflow/frontend/urls.py b/htsworkflow/frontend/urls.py
index a03330436e72343d668911aeda5bcdac5659263a..37817160aa523ca915eb348dc334fad8dcad2341 100644 (file)
--- a/htsworkflow/frontend/urls.py
+++ b/htsworkflow/frontend/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import include, patterns
 from django.contrib import admin
 import django
 admin.autodiscover()