remove unicode_literals import

.travis.yml

@@ -3,13 +3,12 @@ sudo: false
 dist: xenial
 
 python:
-  - "3.5"
   - "3.6"
   - "3.7"
+  - "3.8"
 env:
-  - DJANGO=1.11.20
-  - DJANGO=2.1.8
-  - DJANGO=2.2.1
+  - DJANGO=2.2.8
+  - DJANGO=3.0.3
 install:
   - pip install --upgrade pip
   - pip install .[files]

spirit/__init__.py

@@ -1,5 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 __version__ = '0.8.0b'

spirit/admin/__init__.py

@@ -1,5 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 default_app_config = 'spirit.admin.apps.SpiritAdminConfig'

spirit/admin/apps.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 

spirit/admin/forms.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 

spirit/admin/tests.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.test import TestCase, RequestFactory
 from django.urls import reverse
 from django.core.exceptions import PermissionDenied

spirit/admin/urls.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.conf.urls import include, url
 
 from . import views

spirit/admin/views.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.shortcuts import render, redirect
 from django.contrib import messages
 from django.utils.translation import ugettext as _

spirit/category/__init__.py

@@ -1,5 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 default_app_config = 'spirit.category.apps.SpiritCategoryConfig'

spirit/category/admin/__init__.py

@@ -1,5 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 default_app_config = 'spirit.category.admin.apps.SpiritCategoryAdminConfig'

spirit/category/admin/apps.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 

spirit/category/admin/forms.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
 import re
 
 from django import forms

spirit/category/admin/tests.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
 import datetime
 
 from django.test import TestCase, RequestFactory

spirit/category/admin/urls.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 
 from ...core.conf import settings

spirit/category/admin/views.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.shortcuts import render, redirect, get_object_or_404
 from django.contrib.auth import get_user_model
 from django.urls import reverse

spirit/category/apps.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 

spirit/category/managers.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.db import models
 from django.db.models import Q
 

spirit/category/migrations/0001_initial.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import spirit.core.utils.models
 

spirit/category/migrations/0002_auto_20150728_0442.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 

spirit/category/migrations/0003_category_is_global.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 

spirit/category/migrations/0004_category_color.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

spirit/category/migrations/0005_category_reindex_at.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.utils.timezone
 

spirit/category/models.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.urls import reverse

spirit/category/tests.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 import datetime
 import importlib
 

spirit/category/urls.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 
 from . import views

spirit/category/views.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.views.generic import ListView
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponsePermanentRedirect

spirit/comment/__init__.py

@@ -1,5 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 default_app_config = 'spirit.comment.apps.SpiritCommentConfig'

spirit/comment/apps.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 

spirit/comment/bookmark/__init__.py

@@ -1,5 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 default_app_config = 'spirit.comment.bookmark.apps.SpiritCommentBookmarkConfig'

spirit/comment/bookmark/apps.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 

spirit/comment/bookmark/forms.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django import forms
 
 from .models import CommentBookmark

spirit/comment/bookmark/migrations/0001_initial.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.conf import settings
 

spirit/comment/bookmark/migrations/0002_auto_20150828_2003.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.conf import settings
 

spirit/comment/bookmark/models.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 

spirit/comment/bookmark/tests.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.test import TestCase
 from django.urls import reverse
 from django.template import Template, Context

spirit/comment/bookmark/urls.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 
 from . import views

spirit/comment/bookmark/views.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import get_object_or_404
 from django.shortcuts import redirect

spirit/comment/flag/__init__.py

@@ -1,5 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 default_app_config = 'spirit.comment.flag.apps.SpiritCommentFlagConfig'

spirit/comment/flag/admin/__init__.py

@@ -1,5 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 default_app_config = 'spirit.comment.flag.admin.apps.SpiritCommentFlagAdminConfig'

spirit/comment/flag/admin/apps.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 

spirit/comment/flag/admin/forms.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django import forms
 
 from ..models import CommentFlag
@@ -19,4 +17,4 @@ def __init__(self, user=None, *args, **kwargs):
 
     def save(self, commit=True):
         self.instance.moderator = self.user
-        return super(CommentFlagForm, self).save(commit)
+        return super(CommentFlagForm, self).save(commit)

spirit/comment/flag/admin/urls.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 
 from . import views

spirit/comment/flag/admin/views.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.shortcuts import render, redirect, get_object_or_404
 from django.urls import reverse
 from django.contrib import messages

spirit/comment/flag/apps.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 

spirit/comment/flag/forms.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django.db import IntegrityError, transaction

spirit/comment/flag/migrations/0001_initial.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import django.utils.timezone
 from django.conf import settings

spirit/comment/flag/migrations/0002_auto_20150828_2003.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.conf import settings
 

spirit/comment/flag/models.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone

spirit/comment/flag/tests.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.test import TestCase
 from django.urls import reverse
 

spirit/comment/flag/urls.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 
 from . import views

spirit/comment/flag/views.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render, redirect, get_object_or_404