Merge pull request #522 from cosmologist10/docs

Django version upgraded from 1.8 to 1.9

Author: kracekumar

junction/base/monkey.py

@@ -36,8 +36,9 @@ def patch_urlresolvers():
 
     old_reverse = urlresolvers.reverse
 
-    def new_reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None, current_app=None):
-        path = old_reverse(viewname, urlconf=urlconf, args=args, kwargs=kwargs, prefix=prefix, current_app=current_app)
+    def new_reverse(viewname, urlconf=None, args=None, kwargs=None, current_app=None):
+        path = old_reverse(viewname, urlconf=urlconf, args=args, kwargs=kwargs,
+                           current_app=current_app)
         if is_absolute_url(path):
             return path
 

junction/proposals/urls.py

@@ -2,22 +2,22 @@
 from __future__ import absolute_import, unicode_literals
 
 # Third Party Stuff
-from django.conf.urls import include, patterns, url
+from django.conf.urls import include, url
 
 from . import comments_views, views, votes_views, dashboard
 
-comment_urls = patterns(
-    '',
+comment_urls = [
+
     url(r'^(?P<proposal_slug>[\w-]+)/create/$',
         comments_views.create_proposal_comment, name='proposal-comment-create'),
     url(r'^(?P<proposal_slug>[\w-]+)/comments/(?P<proposal_comment_id>\d+)/up-vote/$',
         votes_views.proposal_comment_up_vote, name='proposal-comment-up-vote'),
     url(r'^(?P<proposal_slug>[\w-]+)/comments/(?P<proposal_comment_id>\d+)/down-vote/$',
         votes_views.proposal_comment_down_vote, name='proposal-comment-down-vote'),
-)
+]
+
+urlpatterns = [
 
-urlpatterns = patterns(
-    '',
     # proposal urls
     url(r'^$', views.list_proposals, name='proposals-list'),
     url(r'^create/$', views.create_proposal, name='proposal-create'),
@@ -40,4 +40,4 @@
     url(r'^(?P<proposal_slug>[\w-]+)/vote/$', votes_views.proposal_reviewer_vote, name='proposal-reviewer-vote'),
     url(r'^(?P<proposal_slug>[\w-]+)/second-vote/$', votes_views.proposal_reviewer_secondary_vote,
         name='proposal-reviewer-secondary-vote'),
-)
+]

junction/schedule/urls.py

@@ -2,12 +2,11 @@
 from __future__ import absolute_import, unicode_literals
 
 # Third Party Stuff
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from . import views
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     # schedule urls
     url(r'^dummy_schedule/$', views.dummy_schedule, name='dummy_schedule'),
-)
+]

junction/templates/account/email.html

@@ -1,6 +1,6 @@
 {% extends "account/base.html" %}
 {% load i18n %}
-{% load url from future %}
+
 
 {% load django_bootstrap_breadcrumbs %}
 

junction/templates/account/email_confirm.html

@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 {% load account %}
 {% load django_bootstrap_breadcrumbs %}

junction/templates/account/login.html

@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load account %}
 {% load django_bootstrap_breadcrumbs %}
-{% load url from future %}
 
 {% block head_title %}{% trans "Sign In" %} · {{ block.super }}{% endblock %}
 

junction/templates/account/logout.html

@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 
 {% load django_bootstrap_breadcrumbs %}

junction/templates/account/password_change.html

@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load i18n %}
 {% load django_bootstrap_breadcrumbs %}
 

junction/templates/account/password_reset.html

@@ -1,7 +1,7 @@
 {% extends "account/base.html" %}
 {% load i18n %}
 {% load account %}
-{% load url from future %}
+
 {% load django_bootstrap_breadcrumbs %}
 
 {% block head_title %}{% trans "Password Reset" %} · {{ block.super }}{% endblock %}

junction/templates/account/password_reset_from_key.html

@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load url from future %}
+
 {% load django_bootstrap_breadcrumbs %}
 {% load i18n %}