Updates and fixes

Author: matthiask

.editorconfig

@@ -0,0 +1,13 @@
+# top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
+
+[*.py]
+indent_size = 4

.pre-commit-config.yaml

@@ -0,0 +1,49 @@
+exclude: ".yarn/|yarn.lock"
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-merge-conflict
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: file-contents-sorter
+        files: requirements-to-freeze.txt
+  - repo: local
+    hooks:
+      - id: django-check
+        name: django check
+        entry: venv/bin/python manage.py check
+        pass_filenames: false
+        language: system
+        always_run: true
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.1.0
+    hooks:
+      - id: pyupgrade
+        args: [--py39-plus]
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: 1.11.0
+    hooks:
+      - id: django-upgrade
+        args: [--target-version, "3.2"]
+  - repo: https://github.com/MarcoGorelli/absolufy-imports
+    rev: v0.3.1
+    hooks:
+      - id: absolufy-imports
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+        args: [--profile=black, --lines-after-imports=2, --combine-as]
+  - repo: https://github.com/psf/black
+    rev: 22.10.0
+    hooks:
+      - id: black
+  - repo: https://github.com/pycqa/flake8
+    rev: 5.0.4
+    hooks:
+      - id: flake8
+        args: ["--ignore=E203,E501,W503"]
+        additional_dependencies:
+          - flake8-bugbear

feincms_handlers/__init__.py

@@ -14,6 +14,7 @@
 
 """
 
+
 class NotMyJob(Exception):
     def __init__(self, author):
         self.author = author

feincms_handlers/handlers.py

@@ -1,19 +1,25 @@
 from django.http import Http404, HttpResponse
 from feincms.utils import get_object
+from feincms.views import Handler as FeinCMSHandler
+
 from feincms_handlers import NotMyJob
+from feincms_handlers.views.cbv.ajax import AjaxHandler
+from feincms_handlers.views.cbv.autolanguage import AutoLanguageHandler
+from feincms_handlers.views.cbv.htmlsnapshot import HtmlSnapshotHandler
 
-from .views.cbv.ajax import AjaxHandler
-from .views.cbv.autolanguage import AutoLanguageHandler
-from feincms.views import Handler as FeinCMSHandler
-from .views.cbv.htmlsnapshot import HtmlSnapshotHandler
 
-__all__ = ['AjaxHandler', 'AutoLanguageHandler', 'FeinCMSHandler',
-           'HtmlSnapshotHandler', 'MasterHandler']
+__all__ = [
+    "AjaxHandler",
+    "AutoLanguageHandler",
+    "FeinCMSHandler",
+    "HtmlSnapshotHandler",
+    "MasterHandler",
+]
 
 
-class MasterHandler(object):
-    """ This is where you register your handlers. They will be called one after the
-        other until one returns a response.
+class MasterHandler:
+    """This is where you register your handlers. They will be called one after the
+    other until one returns a response.
     """
 
     def __init__(self, handlers=None, *args, **kwargs):
@@ -24,8 +30,10 @@ def __init__(self, handlers=None, *args, **kwargs):
         self.__qualname__ = "feincms_handlers.handlers.MasterHandler"
 
     def _register_handler(self, handler):
-        if not hasattr(handler, 'as_view'):
-            raise AttributeError('Handler %s has no method "as_view". Needs one.' % handler)
+        if not hasattr(handler, "as_view"):
+            raise AttributeError(
+                'Handler %s has no method "as_view". Needs one.' % handler
+            )
         self.handlers.append(handler.as_view())
 
     def register(self, handlers):
@@ -38,7 +46,6 @@ def register(self, handlers):
     def unregister(self, handler):
         self.handlers.remove(handler)
 
-
     def __call__(self, request, path=None):
         for handler in self.handlers:
             try:

feincms_handlers/legacy/__init__.py

@@ -18,11 +18,13 @@
 
 from django.http import Http404
 from feincms.utils import get_object
+
 from feincms_handlers import NotMyJob
 
-class MasterHandler(object):
-    """ This is where you register your handlers. They will be called one after the
-        other until one returns a response.
+
+class MasterHandler:
+    """This is where you register your handlers. They will be called one after the
+    other until one returns a response.
     """
 
     def __init__(self, handlers=None, *args, **kwargs):
@@ -31,9 +33,11 @@ def __init__(self, handlers=None, *args, **kwargs):
             self.register(handlers)
 
     def _register_handler(self, handler):
-        handler = get_object(handler) # parse strings
-        if not hasattr(handler, '__call__'):
-            raise AttributeError('Handler %s has no method "__call__". Needs one.' % handler)
+        handler = get_object(handler)  # parse strings
+        if not hasattr(handler, "__call__"):
+            raise AttributeError(
+                'Handler %s has no method "__call__". Needs one.' % handler
+            )
         self.handlers.append(handler)
 
     def register(self, handlers):
@@ -46,7 +50,6 @@ def register(self, handlers):
     def unregister(self, handler):
         self.handlers.remove(handler)
 
-
     def __call__(self, request, path=None):
         for handler in self.handlers:
             try:

feincms_handlers/legacy/feincms_print.py

@@ -3,27 +3,31 @@
 from django.template.context import RequestContext
 from feincms.module.page.models import Page
 from feincms.views.base import Handler
+
 from feincms_handlers import NotMyJob
 
+
 class PrintHandler(Handler):
-    """ This handler handles print previews.
-        It requires a print_... template for every FeinCMS base template.
+    """This handler handles print previews.
+    It requires a print_... template for every FeinCMS base template.
     """
 
     def __call__(self, request, path=None):
-        if not request.GET.get('print', False):
+        if not request.GET.get("print", False):
             raise NotMyJob(self)
-        return self.build_response(request,
-            Page.objects.best_match_for_path(path or request.path, raise404=True))
-
+        return self.build_response(
+            request,
+            Page.objects.best_match_for_path(path or request.path, raise404=True),
+        )
 
     def render(self, request, page):
         context = request._feincms_extra_context
-        print_template = 'print_%s' % page.template.path
-        context['feincms_page'] = page
+        print_template = "print_%s" % page.template.path
+        context["feincms_page"] = page
 
-        return render_to_response(print_template,
-            context_instance=RequestContext(request, context))
+        return render_to_response(
+            print_template, context_instance=RequestContext(request, context)
+        )
 
 
-handler = PrintHandler()
+handler = PrintHandler()

feincms_handlers/legacy/page_id_fallback.py

@@ -1,22 +1,25 @@
-from feincms.views.base import Handler
-from django.shortcuts import get_object_or_404, redirect
 from django.http import Http404
+from django.shortcuts import get_object_or_404, redirect
 from feincms.module.page.models import Page
+from feincms.views.base import Handler
+
 from feincms_handlers import NotMyJob
 
+
 class PageIdFallbackHandler(Handler):
-    """ This Handler is used if you have static links within your content.
-        You can append a get parameter 'p' with the page id. The CMS will
-        find the page even if it has been moved.
+    """This Handler is used if you have static links within your content.
+    You can append a get parameter 'p' with the page id. The CMS will
+    find the page even if it has been moved.
     """
 
     def __call__(self, request, path=None):
-        if not request.GET.get('p', None):
+        if not request.GET.get("p", None):
             raise NotMyJob(self)
         try:
-            page = get_object_or_404(Page, pk=request.GET.get('p', None))
+            page = get_object_or_404(Page, pk=request.GET.get("p", None))
         except ValueError:
             raise Http404
         return redirect(page)
 
-handler = PageIdFallbackHandler()
+
+handler = PageIdFallbackHandler()

feincms_handlers/legacy_urls.py

@@ -1,13 +1,17 @@
 """ Add this to your urls.py """
 
 from django.conf.urls.defaults import *
-from feincms_handlers.views.legacy import handler
 
 # FeinCMS Handler location:
 from feincms.views.base import handler as feincms_handler
+
+from feincms_handlers.views.legacy import handler
+
+
 handler.register(feincms_handler)
 
-urlpatterns = patterns('',
-    url(r'^$', handler, name='feincms_home'),
-    url(r'^(.*)/$', handler, name='feincms_handler'),
+urlpatterns = patterns(
+    "",
+    url(r"^$", handler, name="feincms_home"),
+    url(r"^(.*)/$", handler, name="feincms_handler"),
 )