Updates to support django 1.7

boards/models/post.py

@@ -266,7 +266,10 b' class Post(models.Model, Viewable):'
         return self.refmap
 
     def is_referenced(self):
-        return len(self.refmap) > 0
+        if not self.refmap:
+            return False
+        else:
+            return len(self.refmap) > 0
 
     def is_opening(self):
         """
@@ -394,7 +397,9 b' class Post(models.Model, Viewable):'
             if PARAMETER_TRUNCATED in request.GET:
                 context[PARAMETER_TRUNCATED] = True
 
-            return render_to_string('boards/api_post.html', context)
+            # TODO Use dict here
+            return render_to_string('boards/api_post.html',
+                                    context_instance=context)
         elif format_type == DIFF_TYPE_JSON:
             post_json = {
                 'id': self.id,

boards/settings.py

@@ -1,4 +1,4 b''
-VERSION = '2.2.1 Miyu'
+VERSION = '2.2.2 Miyu'
 SITE_NAME = 'Neboard'
 
 CACHE_TIMEOUT = 600  # Timeout for caching, if cache is used

boards/templates/boards/posting_general.html

@@ -15,7 +15,7 b''
     {% if current_page.has_previous %}
         <link rel="prev" href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=current_page.previous_page_number %}
+                {% url "tag" tag_name=tag.name page=current_page.previous_page_number %}
             {% elif archived %}
                 {% url "archive" page=current_page.previous_page_number %}
             {% else %}
@@ -26,7 +26,7 b''
     {% if current_page.has_next %}
         <link rel="next" href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=current_page.next_page_number %}
+                {% url "tag" tag_name=tag.name page=current_page.next_page_number %}
             {% elif archived %}
                 {% url "archive" page=current_page.next_page_number %}
             {% else %}
@@ -70,7 +70,7 b''
             <div class="page_link">
                 <a href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=current_page.previous_page_number %}
+                {% url "tag" tag_name=tag.name page=current_page.previous_page_number %}
             {% elif archived %}
                 {% url "archive" page=current_page.previous_page_number %}
             {% else %}
@@ -112,7 +112,7 b''
             <div class="page_link">
                 <a href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=current_page.next_page_number %}
+                {% url "tag" tag_name=tag.name page=current_page.next_page_number %}
             {% elif archived %}
                 {% url "archive" page=current_page.next_page_number %}
             {% else %}
@@ -157,7 +157,7 b''
         {% trans "Pages:" %}
         <a href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=paginator.page_range|first %}
+                {% url "tag" tag_name=tag.name page=paginator.page_range|first %}
             {% elif archived %}
                 {% url "archive" page=paginator.page_range|first %}
             {% else %}
@@ -172,7 +172,7 b''
                 {% endifequal %}
                 href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=page %}
+                {% url "tag" tag_name=tag.name page=page %}
             {% elif archived %}
                 {% url "archive" page=page %}
             {% else %}
@@ -184,7 +184,7 b''
         ]
         <a href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=paginator.page_range|last %}
+                {% url "tag" tag_name=tag.name page=paginator.page_range|last %}
             {% elif archived %}
                 {% url "archive" page=paginator.page_range|last %}
             {% else %}

boards/thumbs.py

@@ -212,8 +212,4 b' class ImageWithThumbsField(ImageField):'
                 thumb_height_ratio = int(original_height * scale_ratio)
 
             setattr(instance, thumb_width_field, thumb_width_ratio)
-            setattr(instance, thumb_height_field, thumb_height_ratio)
-
-
-from south.modelsinspector import add_introspection_rules
-add_introspection_rules([], ["^boards\.thumbs\.ImageWithThumbsField"])
+            setattr(instance, thumb_height_field, thumb_height_ratio)
  No newline at end of file

boards/views/all_tags.py

@@ -10,4 +10,5 b' class AllTagsView(BaseBoardView):'
         context = self.get_context_data(request=request)
         context['all_tags'] = Tag.objects.get_not_empty_tags()
 
-        return render(request, 'boards/tags.html', context)
+        # TODO Use dict here
+        return render(request, 'boards/tags.html', context_instance=context)

boards/views/all_threads.py

@@ -51,7 +51,8 b' class AllThreadsView(PostMixin, BaseBoar'
 
         self._get_page_context(paginator, context, page)
 
-        return render(request, TEMPLATE, context)
+        # TODO Use dict here
+        return render(request, TEMPLATE, context_instance=context)
 
     def post(self, request, page=DEFAULT_PAGE):
         form = ThreadForm(request.POST, request.FILES,

boards/views/api.py

@@ -7,7 +7,6 b' from django.shortcuts import get_object_'
 from django.template import RequestContext
 from django.utils import timezone
 from django.core import serializers
-from django.template.loader import render_to_string
 
 from boards.forms import PostForm, PlainErrorList
 from boards.models import Post, Thread, Tag
@@ -123,7 +122,8 b' def get_post(request, post_id):'
     if PARAMETER_TRUNCATED in request.GET:
         context[PARAMETER_TRUNCATED] = True
 
-    return render(request, 'boards/api_post.html', context)
+    # TODO Use dict here
+    return render(request, 'boards/api_post.html', context_instance=context)
 
 
 # TODO Test this

boards/views/authors.py

@@ -10,4 +10,5 b' class AuthorsView(BaseBoardView):'
         context = self.get_context_data(request=request)
         context['authors'] = authors
 
-        return render(request, 'boards/authors.html', context)
+        # TODO Use dict here
+        return render(request, 'boards/authors.html', context_instance=context)

boards/views/banned.py

@@ -13,4 +13,7 b' class BannedView(BaseBoardView):'
 
         ban = get_object_or_404(Ban, ip=utils.get_client_ip(request))
         context['ban_reason'] = ban.reason
-        return render(request, 'boards/staticpages/banned.html', context)
+
+        # TODO Use dict here
+        return render(request, 'boards/staticpages/banned.html',
+                      context_instance=context)

boards/views/not_found.py

@@ -10,4 +10,6 b' class NotFoundView(BaseBoardView):'
 
     def get(self, request):
         context = self.get_context_data(request=request)
-        return render(request, 'boards/404.html', context)
+
+        # TODO Use dict here
+        return render(request, 'boards/404.html', context_instance=context)

boards/views/post_admin.py

@@ -30,7 +30,9 b' class PostAdminView(BaseBoardView, Dispa'
 
         context['tag_form'] = form
 
-        return render(request, 'boards/post_admin.html', context)
+        # TODO Use dict here
+        return render(request, 'boards/post_admin.html',
+                      context_instance=context)
 
     def post(self, request, post_id):
         settings_manager = get_settings_manager(request)

boards/views/preview.py

@@ -18,7 +18,8 b' class PostPreviewView(View):'
     def get(self, request):
         context = RequestContext(request)
 
-        return render(request, TEMPLATE, context)
+        # TODO Use dict here
+        return render(request, TEMPLATE, context_instance=context)
 
     def post(self, request):
         context = RequestContext(request)
@@ -32,4 +33,5 b' class PostPreviewView(View):'
                 context[CONTEXT_RESULT] = rendered_text
                 context[CONTEXT_QUERY] = raw_text
 
-        return render(request, TEMPLATE, context)
+        # TODO Use dict here
+        return render(request, TEMPLATE, context_instance=context)

boards/views/search.py

@@ -37,4 +37,5 b' class BoardSearchView(View):'
                 context[CONTEXT_PAGE] = paginator.page(page)
                 context[CONTEXT_QUERY] = query
 
-        return render(request, TEMPLATE, context)
+        # TODO Use dict here
+        return render(request, TEMPLATE, context_instance=context)

boards/views/settings.py

@@ -22,7 +22,8 b' class SettingsView(BaseBoardView):'
         context[CONTEXT_FORM] = form
         context[CONTEXT_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
 
-        return render(request, 'boards/settings.html', context)
+        # TODO Use dict here
+        return render(request, 'boards/settings.html', context_instance=context)
 
     def post(self, request):
         settings_manager = get_settings_manager(request)

boards/views/static.py

@@ -11,4 +11,7 b' class StaticPageView(BaseBoardView):'
         """
 
         context = self.get_context_data(request=request)
-        return render(request, 'boards/staticpages/' + name + '.html', context)
+
+        # TODO Use dict here
+        return render(request, 'boards/staticpages/' + name + '.html',
+                      context_instance=context)

boards/views/thread.py

@@ -92,7 +92,8 b' class ThreadView(BaseBoardView, PostMixi'
         else:
             raise Http404
 
-        return render(request, document, context)
+        # TODO Use dict here
+        return render(request, document, context_instance=context)
 
     def post(self, request, post_id, mode=MODE_NORMAL):
         opening_post = get_object_or_404(Post, id=post_id)

neboard/settings.py

@@ -145,8 +145,6 b' INSTALLED_APPS = ('
     'django.contrib.humanize',
     'django_cleanup',
 
-    # Migrations
-    'south',
     'debug_toolbar',
 
     # Search

requirements.txt

@@ -1,8 +1,7 b''
 adjacent
-south>=0.8.4
 haystack
 pillow
-django>=1.6
+django>=1.7
 django_cleanup
 django-markupfield
 bbcode