added django 3.1 support (#55)

* added django 3.1 support

* Add additional fixes

* fix linting

Author: FinalAngel

.travis.yml

@@ -1,45 +1,31 @@
 language: python
 
 dist: xenial
-sudo: false
 
 matrix:
   include:
     - python: 3.5
       env: TOX_ENV='flake8'
     - python: 3.5
       env: TOX_ENV='isort'
-      # Django 1.11
-    - python: 2.7
-      env: DJANGO='dj111'
-    - python: 3.4
-      env: DJANGO='dj111'
+    # Django 2.2, run all supported versions for LTS releases
     - python: 3.5
-      env: DJANGO='dj111'
-    - python: 3.6
-      env: DJANGO='dj111'
-    # Django 2.1
-    - python: 3.6
-      env: DJANGO='dj21'
-    # Django 2.2
+      env: DJANGO='dj22'
     - python: 3.6
       env: DJANGO='dj22'
     - python: 3.7
       env: DJANGO='dj22'
     - python: 3.8
       env: DJANGO='dj22'
-    # Django 3.0
+    # Django 3.0, always run the lowest supported version
     - python: 3.6
       env: DJANGO='dj30'
-    - python: 3.7
-      env: DJANGO='dj30'
-    - python: 3.8
-      env: DJANGO='dj30'
+    # Django 3.1, always run the lowest supported version
+    - python: 3.6
+      env: DJANGO='dj31'
 
 install:
-  - pip install coverage isort tox pep8
-  - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PY_VER=py27; fi"
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PY_VER=py34; fi"
+  - pip install coverage isort tox
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PY_VER=py35; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PY_VER=py36; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then export PY_VER=py37; fi"

CHANGELOG.rst

@@ -3,6 +3,15 @@ Changelog
 =========
 
 
+2.0.0 (unreleased)
+==================
+
+* Added support for Django 3.1
+* Dropped support for Python 2.7 and Python 3.4
+* Dropped support for Django < 2.2
+* Replaced pep8 with flake8
+
+
 1.0.0 (2020-01-22)
 ==================
 

README.rst

@@ -96,7 +96,7 @@ You can run tests by executing::
 .. |coverage| image:: https://codecov.io/gh/divio/django-classy-tags/branch/master/graph/badge.svg
     :target: https://codecov.io/gh/divio/django-classy-tags
 
-.. |python| image:: https://img.shields.io/badge/python-2.7%20%7C%203.4+-blue.svg
+.. |python| image:: https://img.shields.io/badge/python-3.5+-blue.svg
     :target: https://pypi.org/project/django-classy-tags/
-.. |django| image:: https://img.shields.io/badge/django-1.11%20%7C%202.2%20%7C%203.0-blue.svg
+.. |django| image:: https://img.shields.io/badge/django-2.2,%203.0,%203.1-blue.svg
     :target: https://www.djangoproject.com/

classytags/__init__.py

@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 __version__ = '1.0.0'

classytags/arguments.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django import template
 from django.core.exceptions import ImproperlyConfigured
 
@@ -10,7 +9,7 @@
 )
 
 
-class Argument(object):
+class Argument:
     """
     A basic single value argument.
     """
@@ -61,7 +60,7 @@ class KeywordArgument(Argument):
 
     def __init__(self, name, default=None, required=True, resolve=True,
                  defaultkey=None, splitter='='):
-        super(KeywordArgument, self).__init__(name, default, required, resolve)
+        super().__init__(name, default, required, resolve)
         self.defaultkey = defaultkey
         self.splitter = splitter
 
@@ -76,10 +75,10 @@ def get_default(self):
     def parse_token(self, parser, token):
         if self.splitter in token:
             key, raw_value = token.split(self.splitter, 1)
-            value = super(KeywordArgument, self).parse_token(parser, raw_value)
+            value = super().parse_token(parser, raw_value)
         else:
             key = self.defaultkey
-            value = super(KeywordArgument, self).parse_token(parser, token)
+            value = super().parse_token(parser, token)
         return key, self.value_class(value)
 
     def parse(self, parser, token, tagname, kwargs):
@@ -107,7 +106,7 @@ class ChoiceArgument(Argument):
 
     def __init__(self, name, choices, default=None, required=True,
                  resolve=True):
-        super(ChoiceArgument, self).__init__(name, default, required, resolve)
+        super().__init__(name, default, required, resolve)
         if default or not required:
             value_on_error = default
         else:
@@ -136,8 +135,7 @@ def __init__(self, name, default=NULL, required=True, max_values=None,
             default = []
         else:
             required = False
-        super(MultiValueArgument, self).__init__(name, default, required,
-                                                 resolve)
+        super().__init__(name, default, required, resolve)
 
     def parse(self, parser, token, tagname, kwargs):
         """
@@ -160,8 +158,7 @@ def __init__(self, name, default=None, required=True, resolve=True,
             default = {}
         else:
             default = dict(default)
-        super(MultiKeywordArgument, self).__init__(name, default, required,
-                                                   resolve, NULL, splitter)
+        super().__init__(name, default, required, resolve, NULL, splitter)
         self.max_values = max_values
 
     def get_default(self):
@@ -197,7 +194,7 @@ def __init__(self, name, default=NULL, true_values=None, false_values=None,
             required = False
         else:
             required = True
-        super(Flag, self).__init__(name, default, required)
+        super().__init__(name, default, required)
         if true_values is None:
             true_values = []
         if false_values is None:

classytags/blocks.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.core.exceptions import ImproperlyConfigured
 
 
@@ -9,7 +8,7 @@ def _collect(name, parser):
     return name
 
 
-class BlockDefinition(object):
+class BlockDefinition:
     """
     Definition of 'parse-until-blocks' used by the parser.
     """
@@ -27,7 +26,7 @@ def collect(self, parser):
         return [_collect(name, parser) for name in self.names]
 
 
-class VariableBlockName(object):
+class VariableBlockName:
     def __init__(self, template, argname):
         self.template = template
         self.argname = argname

classytags/core.py

@@ -1,16 +1,13 @@
-# -*- coding: utf-8 -*-
 from operator import attrgetter
 
 from django.template import Node
 
-import six
-
 from classytags.blocks import BlockDefinition
 from classytags.parser import Parser
 from classytags.utils import StructuredOptions, get_default_name
 
 
-class Options(object):
+class Options:
     """
     Option class holding the arguments of a tag.
     """
@@ -26,8 +23,8 @@ def __init__(self, *options, **kwargs):
         self.options[current_breakpoint] = []
         self.all_argument_names = []
         for value in options:
-            if isinstance(value, six.string_types):
-                if isinstance(last, six.string_types):
+            if isinstance(value, str):
+                if isinstance(last, str):
                     self.combined_breakpoints[last] = value
                 self.breakpoints.append(value)
                 current_breakpoint = value
@@ -40,7 +37,7 @@ def __init__(self, *options, **kwargs):
         for block in kwargs.get('blocks', []):
             if isinstance(block, BlockDefinition):
                 block_definition = block
-            elif isinstance(block, six.string_types):
+            elif isinstance(block, str):
                 block_definition = BlockDefinition(block, block)
             else:
                 block_definition = BlockDefinition(block[1], block[0])
@@ -117,7 +114,7 @@ class TagMeta(type):
     def __new__(cls, name, bases, attrs):
         parents = [base for base in bases if isinstance(base, TagMeta)]
         if not parents:
-            return super(TagMeta, cls).__new__(cls, name, bases, attrs)
+            return super().__new__(cls, name, bases, attrs)
         tag_name = str(attrs.get('name', get_default_name(name)))
 
         def fake_func():
@@ -126,7 +123,7 @@ def fake_func():
         fake_func.__name__ = tag_name
         attrs['_decorated_function'] = fake_func
         attrs['name'] = str(tag_name)
-        return super(TagMeta, cls).__new__(cls, name, bases, attrs)
+        return super().__new__(cls, name, bases, attrs)
 
 
 class Tag(TagMeta('TagMeta', (Node,), {})):

classytags/exceptions.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.template import TemplateSyntaxError
 
 

classytags/helpers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.core.exceptions import ImproperlyConfigured
 from django.template.loader import render_to_string
 
@@ -12,7 +11,7 @@ class AsTag(Tag):
     options must be added 'manually' to the options class.
     """
     def __init__(self, parser, tokens):
-        super(AsTag, self).__init__(parser, tokens)
+        super().__init__(parser, tokens)
         if len(self.options.breakpoints) < 1:
             raise ImproperlyConfigured(
                 "AsTag subclasses require at least one breakpoint."

classytags/parser.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from copy import deepcopy
 
 from django import template
@@ -9,7 +8,7 @@
 )
 
 
-class Parser(object):
+class Parser:
     """
     Argument parsing class. A new instance of this gets created each time a tag
     get's parsed.