Merge pull request #419 from infoportugal/test_417

Test 417

.github/workflows/python-package.yml

@@ -25,13 +25,13 @@ jobs:
         uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python }}
-      - name: Install flake8
+      - name: Install black
         run: |
           python -m pip install --upgrade pip
-          pip install flake8
-      - name: Lint with flake8
+          pip install black
+      - name: Lint with black
         run: |
-          flake8 --ignore=E501 wagtail_modeltranslation
+          black wagtail_modeltranslation
   Test:
     runs-on: ubuntu-latest
     strategy:

wagtail_modeltranslation/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.14.1'
-default_app_config = 'wagtail_modeltranslation.apps.WagtailModeltranslationConfig'
+__version__ = "0.14.1"
+default_app_config = "wagtail_modeltranslation.apps.WagtailModeltranslationConfig"

wagtail_modeltranslation/apps.py

@@ -2,33 +2,42 @@
 
 
 class WagtailModeltranslationConfig(AppConfig):
-    name = 'wagtail_modeltranslation'
-    verbose_name = 'Wagtail Modeltranslation'
+    name = "wagtail_modeltranslation"
+    verbose_name = "Wagtail Modeltranslation"
 
     def ready(self):
         from django.conf import settings
         from modeltranslation import settings as mt_settings
 
         # Add Wagtail defined fields as modeltranslation custom fields
         wagtail_fields = (
-            'StreamField',
-            'RichTextField',
+            "StreamField",
+            "RichTextField",
         )
 
         # update both the standard settings and the modeltranslation settings,
         # as we cannot guarantee the load order, and so django_modeltranslation
         # may bootstrap itself either before, or after, our ready() gets called.
-        custom_fields = getattr(settings, 'MODELTRANSLATION_CUSTOM_FIELDS', tuple())
-        setattr(settings, 'MODELTRANSLATION_CUSTOM_FIELDS', tuple(set(custom_fields + wagtail_fields)))
+        custom_fields = getattr(settings, "MODELTRANSLATION_CUSTOM_FIELDS", tuple())
+        setattr(
+            settings,
+            "MODELTRANSLATION_CUSTOM_FIELDS",
+            tuple(set(custom_fields + wagtail_fields)),
+        )
 
-        mt_custom_fields = getattr(mt_settings, 'CUSTOM_FIELDS', tuple())
-        setattr(mt_settings, 'CUSTOM_FIELDS', tuple(set(mt_custom_fields + wagtail_fields)))
+        mt_custom_fields = getattr(mt_settings, "CUSTOM_FIELDS", tuple())
+        setattr(
+            mt_settings, "CUSTOM_FIELDS", tuple(set(mt_custom_fields + wagtail_fields))
+        )
 
         from modeltranslation.models import handle_translation_registrations
+
         handle_translation_registrations()
 
         from .patch_wagtailadmin import patch_wagtail_models
+
         patch_wagtail_models()
 
         from wagtail_modeltranslation.signal_handlers import register_signal_handlers
+
         register_signal_handlers()

wagtail_modeltranslation/contextlib.py

@@ -10,6 +10,7 @@ class use_language:
         with use_language('en'):
             en_url = obj.get_absolute_url()
     """
+
     def __init__(self, lang):
         self.language = lang
         self.current_language = get_language()

wagtail_modeltranslation/makemigrations/__init__.py

@@ -1 +1 @@
-default_app_config = 'wagtail_modeltranslation.makemigrations.apps.MakemigrationsConfig'
+default_app_config = "wagtail_modeltranslation.makemigrations.apps.MakemigrationsConfig"

wagtail_modeltranslation/makemigrations/apps.py

@@ -2,6 +2,6 @@
 
 
 class MakemigrationsConfig(AppConfig):
-    name = 'wagtail_modeltranslation.makemigrations'
-    label = 'wagtail_modeltranslation_makemigrations'
+    name = "wagtail_modeltranslation.makemigrations"
+    label = "wagtail_modeltranslation_makemigrations"
     verbose_name = "Wagtail Modeltranslation makemigrations"

wagtail_modeltranslation/makemigrations/management/commands/makemigrations.py

@@ -1,5 +1,6 @@
-from wagtail_modeltranslation.management.commands.makemigrations_translation import \
-    Command as MakeMigrationsCommand
+from wagtail_modeltranslation.management.commands.makemigrations_translation import (
+    Command as MakeMigrationsCommand,
+)
 
 
 class Command(MakeMigrationsCommand):

wagtail_modeltranslation/makemigrations/management/commands/makemigrations_original.py

@@ -1,5 +1,6 @@
-from django.core.management.commands.makemigrations import \
-    Command as MakeMigrationsCommand
+from django.core.management.commands.makemigrations import (
+    Command as MakeMigrationsCommand,
+)
 
 
 class Command(MakeMigrationsCommand):

wagtail_modeltranslation/management/commands/makemigrations_translation.py

@@ -1,20 +1,24 @@
 import copy
 
-from django.core.management.commands.makemigrations import \
-    Command as MakeMigrationsCommand
+from django.core.management.commands.makemigrations import (
+    Command as MakeMigrationsCommand,
+)
 from django.db.migrations.autodetector import MigrationAutodetector
 
 
 def autodetector_decorator(func):
     def wrapper(self, from_state, to_state, questioner=None):
         # Replace to_state.app_configs.models and to_state.models' version of page with the old one
         # so no changes are detected by MigrationAutodetector
-        from_state_page = from_state.apps.get_model('wagtailcore', 'page')
+        from_state_page = from_state.apps.get_model("wagtailcore", "page")
         new_to_state = copy.deepcopy(to_state)
-        new_to_state.apps.app_configs['wagtailcore'].models['page'] = from_state_page
-        new_to_state.models['wagtailcore', 'page'] = from_state.models['wagtailcore', 'page']
+        new_to_state.apps.app_configs["wagtailcore"].models["page"] = from_state_page
+        new_to_state.models["wagtailcore", "page"] = from_state.models[
+            "wagtailcore", "page"
+        ]
 
         return func(self, from_state, new_to_state, questioner)
+
     return wrapper
 
 
@@ -23,7 +27,9 @@ class Command(MakeMigrationsCommand):
 
     def handle(self, *args, **options):
         old_autodetector_init = MigrationAutodetector.__init__
-        MigrationAutodetector.__init__ = autodetector_decorator(MigrationAutodetector.__init__)
+        MigrationAutodetector.__init__ = autodetector_decorator(
+            MigrationAutodetector.__init__
+        )
 
         try:
             super(Command, self).handle(*args, **options)

wagtail_modeltranslation/management/commands/migrate_translation.py

@@ -1,23 +1,25 @@
 from django.core.management.commands.migrate import Command as MigrateCommand
 from django.db.migrations.autodetector import MigrationAutodetector
 
-from .sync_page_translation_fields import \
-    Command as SyncPageTranslationFieldsCommand
+from .sync_page_translation_fields import Command as SyncPageTranslationFieldsCommand
 
 
 # decorate MigrationAutodetector.changes so we can silence any wagtailcore migrations missing warnings
 def changes_decorator(func):
     def wrapper(self, graph, trim_to_apps=None, convert_apps=None, migration_name=None):
         changes = func(self, graph, trim_to_apps, convert_apps, migration_name)
-        if 'wagtailcore' in changes:
-            del changes['wagtailcore']
+        if "wagtailcore" in changes:
+            del changes["wagtailcore"]
         return changes
+
     return wrapper
 
 
 class Command(MigrateCommand):
-    help = "Updates database schema. Manages both apps with migrations and those without. " \
-           "Updates Wagtail Page translation fields"
+    help = (
+        "Updates database schema. Manages both apps with migrations and those without. "
+        "Updates Wagtail Page translation fields"
+    )
 
     def handle(self, *args, **options):
         old_autodetector_changes = MigrationAutodetector.changes

wagtail_modeltranslation/management/commands/set_translation_url_paths.py

@@ -8,9 +8,9 @@
 class Command(BaseCommand):
     def __init__(self):
         super(Command, self).__init__()
-        update_fields = ['url_path']
+        update_fields = ["url_path"]
         for language in mt_settings.AVAILABLE_LANGUAGES:
-            localized_url_path = build_localized_fieldname('url_path', language)
+            localized_url_path = build_localized_fieldname("url_path", language)
             update_fields.append(localized_url_path)
         self.update_fields = update_fields
 

wagtail_modeltranslation/management/commands/sync_page_translation_fields.py

@@ -1,5 +1,6 @@
-from modeltranslation.management.commands.sync_translation_fields import \
-    Command as SyncTranslationsFieldsCommand
+from modeltranslation.management.commands.sync_translation_fields import (
+    Command as SyncTranslationsFieldsCommand,
+)
 from modeltranslation.translator import translator
 from wagtail.models import Page
 
@@ -13,9 +14,11 @@ def get_page_model(self, abstract=True):
 
 
 class Command(SyncTranslationsFieldsCommand):
-    help = ("Detect new translatable fields or new available languages and"
-            " sync Wagtail's Page database structure. Does not remove "
-            " columns of removed languages or undeclared fields.")
+    help = (
+        "Detect new translatable fields or new available languages and"
+        " sync Wagtail's Page database structure. Does not remove "
+        " columns of removed languages or undeclared fields."
+    )
 
     def handle(self, *args, **options):
         translator.get_registered_models = get_page_model.__get__(translator)

wagtail_modeltranslation/management/commands/update_translation_fields.py

@@ -1,5 +1,6 @@
-from modeltranslation.management.commands.update_translation_fields import \
-    Command as UpdateTranslationFieldsCommand
+from modeltranslation.management.commands.update_translation_fields import (
+    Command as UpdateTranslationFieldsCommand,
+)
 
 
 class Command(UpdateTranslationFieldsCommand):

wagtail_modeltranslation/migrate/__init__.py

@@ -1 +1 @@
-default_app_config = 'wagtail_modeltranslation.migrate.apps.MigrateConfig'
+default_app_config = "wagtail_modeltranslation.migrate.apps.MigrateConfig"

wagtail_modeltranslation/migrate/apps.py

@@ -2,6 +2,6 @@
 
 
 class MigrateConfig(AppConfig):
-    name = 'wagtail_modeltranslation.migrate'
-    label = 'wagtail_modeltranslation_migrate'
+    name = "wagtail_modeltranslation.migrate"
+    label = "wagtail_modeltranslation_migrate"
     verbose_name = "Wagtail Modeltranslation migrate"

wagtail_modeltranslation/migrate/management/commands/migrate.py

@@ -1,5 +1,6 @@
-from wagtail_modeltranslation.management.commands.migrate_translation import \
-    Command as MigrateCommand
+from wagtail_modeltranslation.management.commands.migrate_translation import (
+    Command as MigrateCommand,
+)
 
 
 class Command(MigrateCommand):