Merge 6f9022f into 11a61e0

.travis.yml

@@ -3,11 +3,13 @@ dist: xenial
 language: python
 
 python:
+  - 3.8
   - 3.7
   - 3.6
   - 3.5
 
 env:
+  - DJANGO="Django>=3.0,<3.1"
   - DJANGO="Django>=2.2,<2.3"
   - DJANGO="Django>=2.1,<2.2"
   - DJANGO="Django>=2.0,<2.1"
@@ -21,6 +23,22 @@ install:
 
 script: coverage run -a --source=sitetree setup.py test
 
+matrix:
+
+  exclude:
+
+   - python: 3.8
+     env: DJANGO="Django>=1.10,<1.11"
+
+   - python: 3.8
+     env: DJANGO="Django>=1.9,<1.10"
+
+   - python: 3.8
+     env: DJANGO="Django>=1.8.6,<1.9"
+
+   - python: 3.5
+     env: DJANGO="Django>=3.0,<3.1"
+
 
 after_success:
   coveralls

sitetree/admin.py

@@ -6,7 +6,6 @@
 except ImportError:
     from django.core.urlresolvers import get_urlconf, get_resolver
 from django.utils.translation import ugettext_lazy as _
-from django.utils import six
 from django.http import HttpResponseRedirect
 from django.contrib import admin
 from django.contrib.admin.sites import NotRegistered
@@ -202,7 +201,7 @@ def get_form(self, request, obj=None, **kwargs):
 
     def _stack_known_urls(self, reverse_dict, ns=None):
         for url_name, url_rules in reverse_dict.items():
-            if isinstance(url_name, six.string_types):
+            if isinstance(url_name, str):
                 if ns is not None:
                     url_name = '%s:%s' % (ns, url_name)
                 self.known_url_names.append(url_name)

sitetree/models.py

@@ -1,6 +1,5 @@
 from django.contrib.auth.models import Permission
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
 from .settings import MODEL_TREE, TREE_ITEMS_ALIASES
@@ -19,7 +18,6 @@ def get_prep_value(self, value):
         return self.to_python(value)
 
 
-@python_2_unicode_compatible
 class TreeBase(models.Model):
 
     title = models.CharField(
@@ -41,7 +39,6 @@ def __str__(self):
         return self.alias
 
 
-@python_2_unicode_compatible
 class TreeItemBase(models.Model):
 
     PERM_TYPE_ANY = 1

sitetree/sitetreeapp.py

@@ -17,8 +17,7 @@
     VARIABLE_TAG_START)
 from django.template.defaulttags import url as url_tag
 from django.template.loader import get_template
-from django.utils import six, module_loading
-from django.utils.encoding import python_2_unicode_compatible
+from django.utils import module_loading
 from django.utils.http import urlquote
 from django.utils.translation import get_language
 
@@ -265,7 +264,7 @@ def result(sitetrees=src):
             'tree': target_tree_alias,
             'parent_item': parent_tree_item_alias}
 
-    if isinstance(src, six.string_types):
+    if isinstance(src, str):
         # Considered to be an application name.
         try:
             module = import_app_sitetree_module(src)
@@ -279,7 +278,6 @@ def result(sitetrees=src):
     return result()
 
 
-@python_2_unicode_compatible
 class LazyTitle(object):
     """Lazily resolves any variable found in a title of an item.
     Produces resolved title as unicode representation."""

sitetree/utils.py

@@ -3,7 +3,6 @@
 from django.apps import apps
 from django.contrib.auth.models import Permission
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import six
 from django.utils.module_loading import module_has_submodule
 
 apps_get_model = apps.get_model
@@ -107,7 +106,7 @@ def item(
             access_by_perms = [access_by_perms]
 
         for perm in access_by_perms:
-            if isinstance(perm, six.string_types):
+            if isinstance(perm, str):
                 # Get permission object from string
                 try:
                     app, codename = perm.split('.')

tox.ini

@@ -3,7 +3,8 @@ install_command = pip install {opts} {packages}
 skip_missing_interpreters = True
 
 envlist =
-    py{35,36,37}-django{18,19,110,111,20,21,22}
+    py{35}-django{18,19,110,111,20,21,22}
+    py{36,37,38}-django{18,19,110,111,20,21,22,30}
 
 
 [testenv]
@@ -16,3 +17,4 @@ deps =
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
     django22: Django>=2.2,<2.3
+    django30: Django>=3.0,<3.1