codysoyland · ebour · Oct 9, 2016
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.idea/*
+build/*
+**.pyc
diff --git a/django_qunit/templates/qunit/index.html b/django_qunit/templates/qunit/index.html
@@ -1,35 +1,34 @@
 <!DOCTYPE html>
 <html>
-<head>
-	<title>QUnit Test Suite</title>
-  <link rel="stylesheet" href="{% url qunit_css %}" type="text/css" media="screen">
-  <script type="text/javascript" src="{% url qunit_js %}"></script>
-  {% for url in suite.extra_urls %}
-    <script type="text/javascript" src="{{ url }}"></script>
-  {% endfor %}
-  {% for url in suite.extra_media_urls %}
-    <script type="text/javascript" src="{{ MEDIA_URL }}{{ url }}"></script>
-  {% endfor %}
-  {% for file in files %}
-    <script type="text/javascript" src="{% url qunit_test file %}"></script>
-  {% endfor %}
-</head>
-<body>
-  <h1 id="qunit-header">QUnit Test Suite ({{ suite.name|capfirst }})</h1>
-	<h2 id="qunit-banner"></h2>
-	<div id="qunit-testrunner-toolbar"></div>
-  {% if in_directory or subsuites %}
-  <div id="navigation">
-    {% if in_subdirectory %}
-    <a href="{% url qunit_test_overview previous_directory %}">..</a>
+  <head>
+      <title>QUnit Test Suite</title>
+      <link rel="stylesheet" href="{% url 'qunit_css' %}" type="text/css" media="screen">
+      <script type="text/javascript" src="{% url 'qunit_js' %}"></script>
+      {% for url in suite.extra_urls %}
+      <script type="text/javascript" src="{{ url }}"></script>
+      {% endfor %}
+      {% for url in suite.extra_media_urls %}
+      <script type="text/javascript" src="{{ MEDIA_URL }}{{ url }}"></script>
+      {% endfor %}
+      {% for file in files %}
+      <script type="text/javascript" src="{% url 'qunit_test' file %}"></script>
+      {% endfor %}
+  </head>
+  <body>
+      <h1 id="qunit-header">QUnit Test Suite ({{ suite.name|capfirst }})</h1>
+      <h2 id="qunit-banner"></h2>
+      <div id="qunit-testrunner-toolbar"></div>
+      {% if in_directory or subsuites %}
+      <div id="navigation">
+      {% if in_subdirectory %}
+      <a href="{% url qunit_test_overview previous_directory %}">..</a>
+      {% endif %}
+      {% for suite in subsuites %}
+      <a href="{{ suite }}/">{{ suite }}</a>
+      {% endfor %}
+    </div>
     {% endif %}
-
-    {% for suite in subsuites %}
-    <a href="{{ suite }}/">{{ suite }}</a>
-    {% endfor %}
-  </div>
-  {% endif %}
-	<h2 id="qunit-userAgent"></h2>
-	<ol id="qunit-tests"></ol>
-</body>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
+  </body>
 </html>
diff --git a/django_qunit/urls.py b/django_qunit/urls.py
@@ -1,19 +1,16 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 from django.conf import settings
+
+from django.views.static import serve
+from django_qunit import views
+
 import os
 
 media_root = os.path.join(os.path.dirname(__file__), 'media')
 
-urlpatterns = patterns('',
-    url(r'^tests/(?P<path>.*)$', 'django.views.static.serve', {
-        'document_root': settings.QUNIT_TEST_DIRECTORY,
-    }, name='qunit_test'),
-    url(r'^qunit/qunit.js', 'django.views.static.serve', {
-        'document_root': media_root, 'path': 'qunit/qunit.js',
-    }, name='qunit_js'),
-    url(r'^qunit/qunit.css', 'django.views.static.serve', {
-        'document_root': media_root, 'path': 'qunit/qunit.css',
-    }, name='qunit_css'),
-    url('^(?P<path>.*)$', 'django_qunit.views.run_tests',
-        name='qunit_test_overview'),
-)
+urlpatterns = [
+    url(r'^tests/(?P<path>.*)$', serve, { 'document_root': settings.QUNIT_TEST_DIRECTORY, }, name='qunit_test'),
+    url(r'^qunit/qunit.js', serve, { 'document_root': media_root, 'path': 'qunit/qunit.js', }, name='qunit_js'),
+    url(r'^qunit/qunit.css', serve, { 'document_root': media_root, 'path': 'qunit/qunit.css',}, name='qunit_css'),
+    url('^(?P<path>.*)$', views.run_tests, name='qunit_test_overview'),
+]
diff --git a/django_qunit/views.py b/django_qunit/views.py
@@ -1,6 +1,6 @@
 from django.shortcuts import render_to_response
 from django.conf import settings
-from django.utils import simplejson
+import json
 
 import os
 
@@ -24,8 +24,8 @@ def get_suite_context(request, path):
     # load suite.json if present
     if 'suite.json' in files:
         file = open(os.path.join(full_path, 'suite.json'), 'r')
-        json = file.read()
-        suite.update(simplejson.loads(json))
+        suite_json = file.read()
+        suite.update(json.loads(suite_json))
 
     previous_directory = parent_directory(path)
 

diff --git a/example/manage.py b/example/manage.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/example/runserver.sh b/example/runserver.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 PYTHONPATH=`pwd`:`pwd`/..:$PYTHONPATH
-django-admin.py runserver --settings=settings 8080
+python manage.py runserver --settings=settings 8080
diff --git a/example/settings.py b/example/settings.py
@@ -7,8 +7,10 @@
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
-ROOT_URLCONF = 'example.urls'
+ROOT_URLCONF = 'urls'
 
 INSTALLED_APPS = (
     'django_qunit',
 )
+
+SECRET_KEY = 'foo'
diff --git a/example/urls.py b/example/urls.py
@@ -1,5 +1,5 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
-urlpatterns = patterns('',
+urlpatterns = [
     url('^qunit/', include('django_qunit.urls'))
-)
+]