Drop support for Django 1.5

@@ -5,14 +5,16 @@ python:
     - "3.2"
     - "3.2"
     - "3.3"
     - "3.3"
 env:
 env:
-    - DJANGO_PACKAGE="Django>=1.5,<1.6"
     - DJANGO_PACKAGE="Django>=1.6,<1.7"
     - DJANGO_PACKAGE="Django>=1.6,<1.7"
     - DJANGO_PACKAGE="Django>=1.7,<1.8"
     - DJANGO_PACKAGE="Django>=1.7,<1.8"
+    - DJANGO_PACKAGE="Django>=1.8,<1.9"
 
 
 matrix:
 matrix:
   exclude:
   exclude:
   - python: "2.6"
   - python: "2.6"
     env: DJANGO_PACKAGE="Django>=1.7,<1.8"
     env: DJANGO_PACKAGE="Django>=1.7,<1.8"
+  - python: "2.6"
+    env: DJANGO_PACKAGE="Django>=1.8,<1.9"
 
 
 install:
 install:
     - pip install $DJANGO_PACKAGE --use-mirrors
     - pip install $DJANGO_PACKAGE --use-mirrors

@@ -8,7 +8,7 @@ class CommentManager(models.Manager):
         """
         """
         QuerySet for all comments currently in the moderation queue.
         QuerySet for all comments currently in the moderation queue.
         """
         """
-        return self.get_query_set().filter(is_public=False, is_removed=False)
+        return self.get_queryset().filter(is_public=False, is_removed=False)
 
 
     def for_model(self, model):
     def for_model(self, model):
         """
         """
@@ -16,7 +16,7 @@ class CommentManager(models.Manager):
         a class).
         a class).
         """
         """
         ct = ContentType.objects.get_for_model(model)
         ct = ContentType.objects.get_for_model(model)
-        qs = self.get_query_set().filter(content_type=ct)
+        qs = self.get_queryset().filter(content_type=ct)
         if isinstance(model, models.Model):
         if isinstance(model, models.Model):
             qs = qs.filter(object_pk=force_text(model._get_pk_val()))
             qs = qs.filter(object_pk=force_text(model._get_pk_val()))
         return qs
         return qs

@@ -66,11 +66,11 @@ class BaseCommentNode(template.Node):
         self.comment = comment
         self.comment = comment
 
 
     def render(self, context):
     def render(self, context):
-        qs = self.get_query_set(context)
+        qs = self.get_queryset(context)
         context[self.as_varname] = self.get_context_value_from_queryset(context, qs)
         context[self.as_varname] = self.get_context_value_from_queryset(context, qs)
         return ''
         return ''
 
 
-    def get_query_set(self, context):
+    def get_queryset(self, context):
         ctype, object_pk = self.get_target_ctype_pk(context)
         ctype, object_pk = self.get_target_ctype_pk(context)
         if not object_pk:
         if not object_pk:
             return self.comment_model.objects.none()
             return self.comment_model.objects.none()
@@ -207,7 +207,7 @@ class RenderCommentListNode(CommentListNode):
                 "comments/%s/list.html" % ctype.app_label,
                 "comments/%s/list.html" % ctype.app_label,
                 "comments/list.html"
                 "comments/list.html"
             ]
             ]
-            qs = self.get_query_set(context)
+            qs = self.get_queryset(context)
             context.push()
             context.push()
             liststr = render_to_string(template_search_list, {
             liststr = render_to_string(template_search_list, {
                 "comment_list" : self.get_context_value_from_queryset(context, qs)
                 "comment_list" : self.get_context_value_from_queryset(context, qs)

@@ -48,9 +48,9 @@ copyright = u'2013, Django Software Foundation and contributors'
 # built documents.
 # built documents.
 #
 #
 # The short X.Y version.
 # The short X.Y version.
-version = '1.5'
+version = '1.6'
 # The full version, including alpha/beta/rc tags.
 # The full version, including alpha/beta/rc tags.
-release = '1.5'
+release = '1.6'
 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 # for a list of supported languages.

@@ -151,7 +151,7 @@ enable it in your project's ``urls.py``:
 
 
 Now you should have the latest comment feeds being served off ``/feeds/latest/``.
 Now you should have the latest comment feeds being served off ``/feeds/latest/``.
 
 
-__ https://docs.djangoproject.com/en/1.5/ref/contrib/syndication/
+__ https://docs.djangoproject.com/en/stable/ref/contrib/syndication/
 
 
 Moderation
 Moderation
 ==========
 ==========

@@ -328,5 +328,5 @@ are not using that, you will need to use the ``csrf_protect`` decorator on any
 views that include the comment form, in order for those views to be able to
 views that include the comment form, in order for those views to be able to
 output the CSRF token and cookie.
 output the CSRF token and cookie.
 
 
-.. _cross site request forgery protection: https://docs.djangoproject.com/en/1.5/ref/contrib/csrf/
+.. _cross site request forgery protection: https://docs.djangoproject.com/en/stable/ref/csrf/
 .. _honeypot: http://en.wikipedia.org/wiki/Honeypot_(computing)
 .. _honeypot: http://en.wikipedia.org/wiki/Honeypot_(computing)

@@ -9,7 +9,7 @@ The comment app sends a series of signals_ to allow for
 comment moderation and similar activities. See `the introduction to signals`_ for information about how to register for and receive these
 comment moderation and similar activities. See `the introduction to signals`_ for information about how to register for and receive these
 signals.
 signals.
 
 
-.. _signals: https://docs.djangoproject.com/en/1.5/topics/signals/
+.. _signals: https://docs.djangoproject.com/en/stable/topics/signals/
 .. _the introduction to signals: signals_
 .. _the introduction to signals: signals_
 
 
 comment_will_be_posted
 comment_will_be_posted

@@ -10,7 +10,7 @@ except IOError:
 
 
 setup(
 setup(
     name='django-contrib-comments',
     name='django-contrib-comments',
-    version='1.5.1',
+    version='1.6.0',
     url="http://github.com/django/django-contrib-comments",
     url="http://github.com/django/django-contrib-comments",
     description='The code formerly known as django.contrib.comments.',
     description='The code formerly known as django.contrib.comments.',
     long_description=long_description,
     long_description=long_description,
@@ -36,5 +36,5 @@ setup(
     packages=find_packages(exclude=['tests']),
     packages=find_packages(exclude=['tests']),
     include_package_data=True,
     include_package_data=True,
     test_suite='tests.runtests.main',
     test_suite='tests.runtests.main',
-    install_requires=['Django>=1.5']
+    install_requires=['Django>=1.6']
 )
 )

 from __future__ import absolute_import
 from __future__ import absolute_import
 
 
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
-from django.template import Template, Context, Library, libraries
+from django.template import Template, Context, Library
+from django.template.base import libraries
 
 
 from django_comments.forms import CommentForm
 from django_comments.forms import CommentForm
 from django_comments.models import Comment
 from django_comments.models import Comment

 [tox]
 [tox]
-envlist = py26-django15, py27-django15, py32-django15, py33-django15,
-          py26-django16, py27-django16, py32-django16, py33-django16,
-          py27-django17, py32-django17, py33-django17
+envlist = py26-django16, py27-django16, py32-django16, py33-django16,
+          py27-django17, py32-django17, py33-django17,
+          py27-django18, py32-django18, py33-django18
 
 
 [testenv]
 [testenv]
 commands = {envpython} setup.py test
 commands = {envpython} setup.py test
 
 
-[testenv:py26-django15]
-basepython = python2.6
-deps =
-    Django>=1.5,<1.6
-    unittest2
-
-[testenv:py27-django15]
-basepython = python2.7
-deps = Django>=1.5,<1.6
-
-[testenv:py32-django15]
-basepython = python3.2
-deps = Django>=1.5,<1.6
-
-[testenv:py33-django15]
-basepython = python3.3
-deps = Django>=1.5,<1.6
-
 [testenv:py26-django16]
 [testenv:py26-django16]
 basepython = python2.6
 basepython = python2.6
 deps =
 deps =
@@ -53,3 +35,15 @@ deps = Django>=1.7,<1.8
 [testenv:py33-django17]
 [testenv:py33-django17]
 basepython = python3.3
 basepython = python3.3
 deps = Django>=1.7,<1.8
 deps = Django>=1.7,<1.8
+
+[testenv:py27-django18]
+basepython = python2.7
+deps = Django>=1.8,<1.9
+
+[testenv:py32-django18]
+basepython = python3.2
+deps = Django>=1.8,<1.9
+
+[testenv:py33-django18]
+basepython = python3.3
+deps = Django>=1.8,<1.9