From: Diane Trout <diane@ghic.org>
Date: Tue, 10 Dec 2013 23:11:54 +0000 (-0800)
Subject: Fix urls patterns import to be compatible with django 1.6
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=11ec5dd4e235619ac0bd8eb3c78aa51e4db03af9

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 62497d2..d5c9627 100644
--- 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 129f57c..a709407 100644
--- 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 91202a8..6a53cdb 100644
--- 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 7269a80..fc25768 100644
--- 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 5a004f2..fa76f83 100644
--- 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 fea937c..bd8a8f6 100644
--- 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 a033304..3781716 100644
--- 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()