Merge pull request #372 from nephila/hotfix/failures

Fix failures in menu tests

.travis.yml

@@ -9,7 +9,6 @@ python:
   - 3.4
   - 3.3
   - 2.7
-  - 2.6
 
 env:
   matrix:
@@ -33,7 +32,6 @@ env:
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
-  - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then export PYVER=py26; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PYVER=py33; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi"

HISTORY.rst

@@ -4,6 +4,12 @@
 History
 =======
 
+*******************
+0.8.13 (unreleased)
+*******************
+
+* Drop python 2.6 compatibility
+
 *******************
 0.8.12 (2017-03-11)
 *******************

djangocms_blog/managers.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
-import django
+from collections import Counter
+
 from aldryn_apphooks_config.managers.parler import (
     AppHookConfigTranslatableManager, AppHookConfigTranslatableQueryset,
 )
@@ -9,11 +10,6 @@ from django.contrib.sites.models import Site
 from django.db import models
 from django.utils.timezone import now
 
-try:
-    from collections import Counter
-except ImportError:
-    from .compat import Counter
-
 
 class TaggedFilterItem(object):
 
@@ -129,12 +125,7 @@ class GenericDateTaggedManager(TaggedFilterItem, AppHookConfigTranslatableManage
     queryset_class = GenericDateQuerySet
 
     def get_queryset(self, *args, **kwargs):
-        try:
+        return super(GenericDateTaggedManager, self).get_queryset(*args, **kwargs)
-            return super(GenericDateTaggedManager, self).get_queryset(*args, **kwargs)
-        except AttributeError:  # pragma: no cover
-            return super(GenericDateTaggedManager, self).get_query_set(*args, **kwargs)
-    if django.VERSION < (1, 8):
-        get_query_set = get_queryset
 
     def published(self):
         return self.get_queryset().published()

tests/test_menu.py

@@ -45,6 +45,7 @@ class MenuTest(BaseTest):
 
         for lang in ('en', 'it'):
             with smart_override(lang):
+                self._reset_menus()
                 request = self.get_page_request(pages[1], self.user, pages[1].get_absolute_url(lang))
                 nodes = menu_pool.get_nodes(request)
                 nodes_url = set([node.url for node in nodes])
@@ -55,6 +56,7 @@ class MenuTest(BaseTest):
         posts[0].categories.clear()
         for lang in ('en', 'it'):
             with smart_override(lang):
+                self._reset_menus()
                 request = self.get_page_request(pages[1], self.user, pages[1].get_absolute_url(lang))
                 nodes = menu_pool.get_nodes(request)
                 nodes_url = set([node.url for node in nodes])
@@ -75,6 +77,7 @@ class MenuTest(BaseTest):
 
         for lang in languages:
             with smart_override(lang):
+                self._reset_menus()
                 cats_url[lang] = set([cat.get_absolute_url() for cat in self.cats if cat.has_translation(lang)])
                 posts_url[lang] = set([post.get_absolute_url(lang) for post in posts if post.has_translation(lang) and post.app_config == self.app_config_1])
 
@@ -85,6 +88,7 @@ class MenuTest(BaseTest):
         for lang in languages:
             request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
             with smart_override(lang):
+                self._reset_menus()
                 nodes = menu_pool.get_nodes(request)
                 nodes_url = set([node.url for node in nodes])
                 self.assertFalse(cats_url[lang].issubset(nodes_url))
@@ -97,6 +101,7 @@ class MenuTest(BaseTest):
         for lang in languages:
             request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
             with smart_override(lang):
+                self._reset_menus()
                 nodes = menu_pool.get_nodes(request)
                 nodes_url = set([node.url for node in nodes])
                 self.assertFalse(cats_url[lang].issubset(nodes_url))
@@ -109,6 +114,7 @@ class MenuTest(BaseTest):
         for lang in languages:
             request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
             with smart_override(lang):
+                self._reset_menus()
                 nodes = menu_pool.get_nodes(request)
                 nodes_url = set([node.url for node in nodes])
                 self.assertTrue(cats_url[lang].issubset(nodes_url))
@@ -121,6 +127,7 @@ class MenuTest(BaseTest):
         for lang in languages:
             request = self.get_page_request(None, self.user, r'/%s/page-two/' % lang)
             with smart_override(lang):
+                self._reset_menus()
                 nodes = menu_pool.get_nodes(request)
                 nodes_url = set([node.url for node in nodes])
                 self.assertTrue(cats_url[lang].issubset(nodes_url))

tox.ini

@@ -1,11 +1,9 @@
 [tox]
-envlist = pep8,isort,py{35,34,27}-django{19}-{cms34,cms33,cms32,knocker},py{35,34,33,27}-django{18}-cms{34,33,32,31},py{34,33,27}-django{17,16}-cms{32,31,30},py{26}-django16-cms{31,30}
+envlist = pep8,isort,py{35,34,27}-django{19}-{cms34,cms33,cms32,knocker},py{35,34,33,27}-django{18}-cms{34,33,32,31},py{34,33,27}-django{17,16}-cms{32,31,30}
 
 [testenv]
 commands = {env:COMMAND:python} cms_helper.py test djangocms_blog
 deps =
-    py26: unittest2
-    py26: Pillow<4.0
     django16: Django>=1.6,<1.7
     django16: django-taggit<0.18
     django16: django-mptt<0.8