Merge pull request #40 from jasimmk/master

Making requirements to Django 1.6

diff --git a/forum/actions/user.py b/forum/actions/user.py
index 5a6aba5ec7918ccd28215684a2a93f498c20deb5..a9ec71ae605309bf6cd961a42d196fcf2a536dc1 100644 (file)
--- a/forum/actions/user.py
+++ b/forum/actions/user.py
@@ -1,6 +1,7 @@
 from django.utils.translation import ungettext, ugettext as _
 from django.core.urlresolvers import reverse
 from django.db.models import F
+from django.contrib import messages
 from forum.models.action import ActionProxy
 from forum.models import Award, Badge, ValidationHash, User
 from forum import settings, REQUEST_HOLDER
@@ -252,4 +253,4 @@ class SuspendAction(ActionProxy):
         return _("%(user)s suspended %(users)s %(suspension)s: %(msg)s") % {
         'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
         'users': self.affected_links(viewer), 'suspension': suspension, 'msg': self.extra.get('publicmsg', _('Bad behaviour'))
-        }
\ No newline at end of file
+        }

diff --git a/forum/skins/default/templates/auth/mail_validation.html b/forum/skins/default/templates/auth/mail_validation.html
index 82029d620862c0f7dd6952ddd1a9ebbb4887cfc7..7e6a2f3022d7b4c1d2c3f5ccb13dfc0308c1582c 100644 (file)
--- a/forum/skins/default/templates/auth/mail_validation.html
+++ b/forum/skins/default/templates/auth/mail_validation.html
@@ -13,17 +13,17 @@
     {% htmlcontent notifications/base.html %}
         <p style="{{ p_style }}">{% trans "Please use the following link to help us verify your email address:" %}</p>
 
-        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl auth_validate_email user=recipient.id,code=validation_code %}">{% trans "Validate my email address" %}</a></p>
+        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl "auth_validate_email" user=recipient.id code=validation_code %}">{% trans "Validate my email address" %}</a></p>
 
         <p style="{{ p_style }}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>
 
-        <p style="{{ p_style }}">{% fullurl auth_validate_email user=recipient.id,code=validation_code %}</p>
+        <p style="{{ p_style }}">{% fullurl "auth_validate_email" user=recipient.id code=validation_code %}</p>
     {% endhtmlcontent %}
 
 {% textcontent notifications/base_text.html %}
 {% trans "Copy and paste this url into your web browser's address bar to help us verify your email address:" %}
 
-{% fullurl auth_validate_email user=recipient.id,code=validation_code %}
+{% fullurl "auth_validate_email" user=recipient.id code=validation_code %}
 {% endtextcontent %}
 
 {% endemail %}

diff --git a/forum/skins/default/templates/auth/temp_login_email.html b/forum/skins/default/templates/auth/temp_login_email.html
index 32ade899f9fab341036be8d16807bf3b5d0d02d0..3c5707f0f0956a87a223d22099ce8f089df36ce3 100644 (file)
--- a/forum/skins/default/templates/auth/temp_login_email.html
+++ b/forum/skins/default/templates/auth/temp_login_email.html
@@ -14,17 +14,17 @@
         <p style="{{ p_style }}">
             {% blocktrans %}The following link grants you a one time access to your account at {{ app_name }}.{% endblocktrans %}
         </p>
-        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}">{% trans "Go to your account" %}</a></p>
+        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl "auth_tempsignin" user=recipient.id code=temp_login_code %}">{% trans "Go to your account" %}</a></p>
 
         <p style="{{ p_style }}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>
 
-        <p style="{{ p_style }}">{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}</p>
+        <p style="{{ p_style }}">{% fullurl "auth_tempsignin" user=recipient.id code=temp_login_code %}</p>
     {% endhtmlcontent %}
 
 {% textcontent notifications/base_text.html %}
 {% blocktrans %}The following url grants you a one time access to your account at {{ app_name }}.{% endblocktrans %}
 
-{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}
+{% fullurl "auth_tempsignin" user=recipient.id code=temp_login_code %}
 {% endtextcontent %}
 
 {% endemail %}

diff --git a/forum/views/meta.py b/forum/views/meta.py
index a47cf1d8bbc5f04ffbae53c942c41d4e0842e414..e7d151588a8402a6e0c2b73c19cf03b9005e91c0 100644 (file)
--- a/forum/views/meta.py
+++ b/forum/views/meta.py
@@ -37,7 +37,7 @@ def static(request, title, content):
 def media(request, skin, path):
     response = serve(request, "%s/media/%s" % (skin, path),
                  document_root=os.path.join(os.path.dirname(os.path.dirname(__file__)), 'skins').replace('\\', '/'))
-    content_type = response['Content-Type']
+    content_type = response.get('Content-Type', '')
     if ('charset=' not in content_type):
         if (content_type.startswith('text') or content_type=='application/x-javascript'):
             content_type += '; charset=utf-8'

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 669eaf3006a849aefdaf84d40e3adf72d6089742..a8b94e92e200bec718b5f77aec4a07a4b2d1cb1f 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -8,6 +8,7 @@ from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from django.template import RequestContext
 from django import template
 from django.utils.html import *
+from django.utils.http import urlquote
 from django.db.models import Q, Count
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse

diff --git a/forum_modules/akismet/startup.py b/forum_modules/akismet/startup.py
index 2387e05d620fe5f609a85942b943650fc2b92191..c050754add3acb4ba8ba228383257d1e46d1352d 100644 (file)
--- a/forum_modules/akismet/startup.py
+++ b/forum_modules/akismet/startup.py
@@ -1,5 +1,4 @@
 import json
-import loggin
 
 from django.utils.translation import ugettext as _
 from django.http import HttpResponse, HttpResponseRedirect

diff --git a/forum_modules/robotstxt/urls.py b/forum_modules/robotstxt/urls.py
index 5f74a0a62dd250268888945cf2614fb33f87415d..ddcac3bccdaa68444ab5f9adf5b9d74e4697ea01 100644 (file)
--- a/forum_modules/robotstxt/urls.py
+++ b/forum_modules/robotstxt/urls.py
@@ -3,5 +3,5 @@ from django.http import  HttpResponse
 import settings
 
 urlpatterns = patterns('',
-    (r'^robots.txt$',  lambda r: HttpResponse(settings.ROBOTS_FILE.value)),
+    (r'^robots.txt$',  lambda r: HttpResponse(settings.ROBOTS_FILE.value, content_type='text/plain')),
 )

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 896a433d2c874a54191975a3a52d966cba1ab36f..81c1eaaf7093bc065e4bde3b61eb4eaf09736e13 100644 (file)
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -72,7 +72,6 @@ TIME_ZONE = 'America/New_York'
 USE_I18N = True
 LANGUAGE_CODE = 'en'
 
-DJANGO_VERSION = 1.1
 OSQA_DEFAULT_SKIN = 'default'
 
 DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']