Upgrade/py3.10 dj3.2

docs/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 #
 # Spirit documentation build configuration file, created by
 # sphinx-quickstart on Sun Sep 24 08:30:18 2017.

requirements.txt

@@ -1,9 +1,7 @@
-Django>=2.2,<3.2
-django-haystack==3.0
-whoosh==2.7.4
+Django>=3.2
+django-haystack>=3.0
+elasticsearch<8.0,>=7.0  # django-haystack only supports ES<8 (see "https://github.com/django-haystack/django-haystack/blob/master/setup.py")
 mistune==0.8.4
-Pillow==8.0.1
-olefile==0.46
-django-infinite-scroll-pagination>=1.1.0,<1.2
-django-djconfig>=0.8.0,<0.11
-pytz
+Pillow>=9.0
+django-infinite-scroll-pagination>=1.2
+django-djconfig>=0.10.0

runtests.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
 
 import os
 import sys

setup.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
 
 import sys
 import os
@@ -11,12 +9,12 @@
 
 BASE_DIR = os.path.join(os.path.dirname(__file__))
 
-with io.open(os.path.join(BASE_DIR, 'README.md'), encoding='utf-8') as f:
+with open(os.path.join(BASE_DIR, 'README.md'), encoding='utf-8') as f:
     README = f.read()
 
 VERSION = __import__('spirit').__version__
 
-with io.open(os.path.join(BASE_DIR, 'requirements.txt'), encoding='utf-8') as fh:
+with open(os.path.join(BASE_DIR, 'requirements.txt'), encoding='utf-8') as fh:
     REQUIREMENTS = fh.read()
 
 if sys.platform.startswith(('win32', 'darwin')):
@@ -25,7 +23,7 @@
     PYTHON_MAGIC_DEP = ['python-magic==0.4.15']
 
 # allow setup.py to be run from any path
-os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
+os.chdir(os.path.normpath(os.path.join(__file__, os.pardir)))
 
 setup(
     name='django-spirit',

spirit/__init__.py

@@ -1,3 +1 @@
-# -*- coding: utf-8 -*-
-
 __version__ = '0.12.3'

spirit/admin/__init__.py

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

spirit/admin/apps.py

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

spirit/admin/forms.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django import forms
 from django.utils.translation import gettext_lazy as _
 

spirit/admin/tests.py

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

spirit/admin/urls.py

@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
-
-from django.conf.urls import include, re_path
+from django.urls import include
+from django.conf.urls import re_path
 
 from . import views
 import spirit.category.admin.urls

spirit/admin/views.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.shortcuts import render
 from django.contrib import messages
 from django.utils.translation import gettext as _

spirit/category/__init__.py

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

spirit/category/admin/__init__.py

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

spirit/category/admin/apps.py

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

spirit/category/admin/forms.py

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

spirit/category/admin/tests.py

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

spirit/category/admin/urls.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.conf.urls import re_path
 
 from ...core.conf import settings

spirit/category/admin/views.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 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,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.apps import AppConfig
 
 

spirit/category/managers.py

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

spirit/category/migrations/0001_initial.py

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

spirit/category/migrations/0002_auto_20150728_0442.py

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

spirit/category/migrations/0003_category_is_global.py

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

spirit/category/migrations/0004_category_color.py

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

spirit/category/migrations/0005_category_reindex_at.py

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

spirit/category/models.py

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

spirit/category/tests.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import datetime
 import importlib
 

spirit/category/urls.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.conf.urls import re_path
 
 from . import views

spirit/category/views.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 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,3 +1 @@
-# -*- coding: utf-8 -*-
-
 default_app_config = 'spirit.comment.apps.SpiritCommentConfig'

spirit/comment/apps.py

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

spirit/comment/bookmark/__init__.py

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

spirit/comment/bookmark/apps.py

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

spirit/comment/bookmark/forms.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django import forms
 
 from .models import CommentBookmark
@@ -12,7 +10,7 @@ class Meta:
         fields = ['comment_number']
 
     def __init__(self, user=None, topic=None, *args, **kwargs):
-        super(BookmarkForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.user = user
         self.topic = topic
 

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.db import models, migrations
 from django.conf import settings
 
@@ -26,6 +25,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='commentbookmark',
-            unique_together=set([('user', 'topic')]),
+            unique_together={('user', 'topic')},
         ),
     ]

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

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

spirit/comment/bookmark/models.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 

spirit/comment/bookmark/tests.py

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

spirit/comment/bookmark/urls.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.conf.urls import re_path
 
 from . import views

spirit/comment/bookmark/views.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 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,3 +1 @@
-# -*- coding: utf-8 -*-
-
 default_app_config = 'spirit.comment.flag.apps.SpiritCommentFlagConfig'

spirit/comment/flag/admin/__init__.py

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

spirit/comment/flag/admin/apps.py

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

spirit/comment/flag/admin/forms.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django import forms
 
 from ..models import CommentFlag
@@ -12,9 +10,9 @@ class Meta:
         fields = ("is_closed", )
 
     def __init__(self, user=None, *args, **kwargs):
-        super(CommentFlagForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.user = user
 
     def save(self, commit=True):
         self.instance.moderator = self.user
-        return super(CommentFlagForm, self).save(commit)
+        return super().save(commit)

spirit/comment/flag/admin/urls.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.conf.urls import re_path
 
 from . import views

spirit/comment/flag/admin/views.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 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,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.apps import AppConfig
 
 

spirit/comment/flag/forms.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django import forms
 from django.utils.translation import gettext_lazy as _
 from django.db import IntegrityError, transaction
@@ -15,12 +13,12 @@ class Meta:
         fields = ['reason', 'body']
 
     def __init__(self, user=None, comment=None, *args, **kwargs):
-        super(FlagForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.user = user
         self.comment = comment
 
     def clean(self):
-        cleaned_data = super(FlagForm, self).clean()
+        cleaned_data = super().clean()
 
         flag = Flag.objects.filter(user=self.user,
                                    comment=self.comment)
@@ -44,4 +42,4 @@ def save(self, commit=True):
             except IntegrityError:
                 pass
 
-        return super(FlagForm, self).save(commit)
+        return super().save(commit)

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.db import models, migrations
 import django.utils.timezone
 from django.conf import settings
@@ -45,6 +44,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='flag',
-            unique_together=set([('user', 'comment')]),
+            unique_together={('user', 'comment')},
         ),
     ]

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

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

spirit/comment/flag/models.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 from django.utils import timezone

spirit/comment/flag/tests.py

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

spirit/comment/flag/urls.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.conf.urls import re_path
 
 from . import views

spirit/comment/flag/views.py

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