Updated to run with old and new versions of django

zunzun · Dec 10, 2016 · a616721 · a616721
1 parent 668d625
commit a616721
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 20 deletions.
diff --git a/settings.py b/settings.py
@@ -82,6 +82,16 @@
     os.path.join(ROOT_PATH, 'templates'),
 )
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': TEMPLATE_DIRS,
+        'APP_DIRS': True,
+        'OPTIONS': {
+            # ... some options here ...
+        },
+    },
+]
 INSTALLED_APPS = (
 #    'django.contrib.auth',
 #    'django.contrib.contenttypes',

diff --git a/urls.py b/urls.py
@@ -1,26 +1,37 @@
-
-
-
-
 from django.views.decorators.cache import cache_page
 from django.conf.urls import *
 import zunzun.views
 import settings
 
-urlpatterns = patterns('',
-    (r"^$", zunzun.views.HomePageView),
-
-    (r"^StatusAndResults/", zunzun.views.StatusView),
-
-    (r"^CharacterizeData/([123])/$", zunzun.views.LongRunningProcessView),
-    (r"^StatisticalDistributions/([1])/$", zunzun.views.LongRunningProcessView),    
-    (r"^FunctionFinder__1___/([23])/$", zunzun.views.LongRunningProcessView),
-    (r"^FunctionFinderResults/([23])/$", zunzun.views.LongRunningProcessView),
-    (r"^FitEquation__1___/([23])/(.+)/(.+)/$", zunzun.views.LongRunningProcessView),
-    (r"^Equation/([23])/(.+)/(.+)/$", zunzun.views.LongRunningProcessView),
-
-    (r"^EvaluateAtAPoint/$", zunzun.views.EvaluateAtAPointView),
+try:
+    urlpatterns = patterns('',
+        (r"^$", zunzun.views.HomePageView),
+
+        (r"^StatusAndResults/", zunzun.views.StatusView),
+
+        (r"^CharacterizeData/([123])/$", zunzun.views.LongRunningProcessView),
+        (r"^StatisticalDistributions/([1])/$", zunzun.views.LongRunningProcessView),    
+        (r"^FunctionFinder__1___/([23])/$", zunzun.views.LongRunningProcessView),
+        (r"^FunctionFinderResults/([23])/$", zunzun.views.LongRunningProcessView),
+        (r"^FitEquation__1___/([23])/(.+)/(.+)/$", zunzun.views.LongRunningProcessView),
+        (r"^Equation/([23])/(.+)/(.+)/$", zunzun.views.LongRunningProcessView),
+
+        (r"^EvaluateAtAPoint/$", zunzun.views.EvaluateAtAPointView),
 
-    (r"^AllEquations/([23])/(.+)/$", zunzun.views.AllEquationsView),
-    (r"^Feedback/$", zunzun.views.FeedbackView),
-)
+        (r"^AllEquations/([23])/(.+)/$", zunzun.views.AllEquationsView),
+        (r"^Feedback/$", zunzun.views.FeedbackView),
+    )
+except:
+    urlpatterns = [
+        url(r"^$", zunzun.views.HomePageView),
+        url(r"^StatusAndResults/", zunzun.views.StatusView),
+        url(r"^CharacterizeData/([123])/$", zunzun.views.LongRunningProcessView),
+        url(r"^StatisticalDistributions/([1])/$", zunzun.views.LongRunningProcessView),    
+        url(r"^FunctionFinder__1___/([23])/$", zunzun.views.LongRunningProcessView),
+        url(r"^FunctionFinderResults/([23])/$", zunzun.views.LongRunningProcessView),
+        url(r"^FitEquation__1___/([23])/(.+)/(.+)/$", zunzun.views.LongRunningProcessView),
+        url(r"^Equation/([23])/(.+)/(.+)/$", zunzun.views.LongRunningProcessView),
+        url(r"^EvaluateAtAPoint/$", zunzun.views.EvaluateAtAPointView),
+        url(r"^AllEquations/([23])/(.+)/$", zunzun.views.AllEquationsView),
+        url(r"^Feedback/$", zunzun.views.FeedbackView),
+]