Corrige importações de módulos do wagtail que ficarão obsoletos (#298)

* Aplica black

* Remove espaços no início e no fim no XML ao obter XMLWithPre

* Troca wagtail.admin.edit_handlers por wagtail.admin.panels

* Troca DocumentChooserPanel por FieldPanel

* Corrige importação de wagtail core e hooks

article/utils/parse_name_author.py

@@ -1,4 +1,4 @@
-import re 
+import re
 
 
 def parse_author_name(name):
@@ -9,4 +9,4 @@ def parse_author_name(name):
     if match:
         return {"given_names": match.group(2), "surname": match.group(1)}
     else:
-        return {"declared_name": name}
+        return {"declared_name": name}

book/models.py

@@ -2,7 +2,7 @@
 from django.utils.translation import gettext as _
 from modelcluster.fields import ParentalKey
 from modelcluster.models import ClusterableModel
-from wagtail.admin.edit_handlers import (
+from wagtail.admin.panels import (
     FieldPanel,
     InlinePanel,
     ObjectList,

book/utils/utils.py

@@ -1,4 +1,4 @@
-import re 
+import re
 
 
 def parse_author_name(name):
@@ -9,4 +9,4 @@ def parse_author_name(name):
     if match:
         return {"given_names": match.group(2), "surname": match.group(1)}
     else:
-        return {"declared_name": name}
+        return {"declared_name": name}

doi/models.py

@@ -1,6 +1,6 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
-from wagtail.admin.edit_handlers import FieldPanel
+from wagtail.admin.panels import FieldPanel
 
 from core.choices import LANGUAGE
 from core.forms import CoreAdminModelForm

pid_provider/wagtail_hooks.py

@@ -64,9 +64,7 @@ class PidProviderXMLAdmin(ModelAdmin):
         "aop_pid",
         "main_doi",
     )
-    list_filter = (
-        "article_pub_year",
-    )
+    list_filter = ("article_pub_year",)
     search_fields = (
         "journal__title",
         "pkg_name",
@@ -100,9 +98,7 @@ class PidChangeAdmin(ModelAdmin):
         "new",
         "pid_type",
     )
-    list_filter = (
-        "pid_type",
-    )
+    list_filter = ("pid_type",)
     search_fields = (
         "old",
         "new",
@@ -113,11 +109,7 @@ class PidProviderAdminGroup(ModelAdminGroup):
     menu_label = _("Pid Provider")
     menu_icon = "folder-open-inverse"  # change as required
     menu_order = 100  # will put in 3rd place (000 being 1st, 100 2nd)
-    items = (
-        PidProviderXMLAdmin,
-        PidRequestAdmin,
-        PidChangeAdmin
-    )
+    items = (PidProviderXMLAdmin, PidRequestAdmin, PidChangeAdmin)
 
 
 modeladmin_register(PidProviderAdminGroup)

researcher/models.py

@@ -2,9 +2,8 @@
 from django.utils.translation import gettext_lazy as _
 from modelcluster.fields import ParentalKey
 from modelcluster.models import ClusterableModel
-from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel
-from wagtail.core.models import Orderable
-from wagtail.documents.edit_handlers import DocumentChooserPanel
+from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel
+from wagtail.models import Orderable
 from wagtailautocomplete.edit_handlers import AutocompletePanel
 
 from core.models import CommonControlField, Gender
@@ -23,9 +22,7 @@ class Researcher(ClusterableModel, CommonControlField):
     given_names = models.CharField(
         _("Given names"), max_length=128, blank=True, null=True
     )
-    last_name = models.CharField(
-        _("Last name"), max_length=128, blank=True, null=True
-    )
+    last_name = models.CharField(_("Last name"), max_length=128, blank=True, null=True)
     declared_name = models.CharField(
         _("Declared Name"), max_length=255, blank=True, null=True
     )
@@ -263,4 +260,4 @@ class EditorialBoardMemberFile(models.Model):
     def filename(self):
         return os.path.basename(self.attachment.name)
 
-    panels = [DocumentChooserPanel("attachment")]
+    panels = [FieldPanel("attachment")]

researcher/wagtail_hooks.py

@@ -7,7 +7,7 @@
     modeladmin_register,
 )
 from wagtail.contrib.modeladmin.views import CreateView
-from wagtail.core import hooks
+from wagtail import hooks
 
 from .button_helper import EditorialBoardMemberHelper
 from .models import EditorialBoardMember, EditorialBoardMemberFile, Researcher

xmlsps/models.py

@@ -213,11 +213,9 @@ def __str__(self):
     @classmethod
     def get_or_create(cls, journal, volume, number, suppl, pub_year):
         if journal is None:
-            raise XMLIssueGetOrCreateError(
-                f"XMLIssue.get_or_create requires journal")
+            raise XMLIssueGetOrCreateError(f"XMLIssue.get_or_create requires journal")
         if pub_year is None:
-            raise XMLIssueGetOrCreateError(
-                f"XMLIssue.get_or_create requires pub_year")
+            raise XMLIssueGetOrCreateError(f"XMLIssue.get_or_create requires pub_year")
         try:
             return cls.objects.get(
                 journal=journal,

xmlsps/wagtail_hooks.py

@@ -27,9 +27,7 @@ class XMLSPSAdmin(ModelAdmin):
         "is_published",
         "pid_v3",
     )
-    list_filter = (
-        "is_published",
-    )
+    list_filter = ("is_published",)
     search_fields = (
         "pid_v3",
         "pid_v2",

xmlsps/xml_sps_lib.py

@@ -187,14 +187,15 @@ def get_xml_with_pre_from_uri(uri, timeout=30):
 
 def get_xml_with_pre(xml_content):
     try:
+        xml_content = xml_content.strip()
         # return etree.fromstring(xml_content)
         pref, xml = split_processing_instruction_doctype_declaration_and_xml(
             xml_content
         )
         return XMLWithPre(pref, etree.fromstring(xml))
 
     except Exception as e:
-        if xml_content.strip():
+        if xml_content:
             raise GetXmlWithPreError(
                 "Unable to get xml with pre %s: %s ... %s"
                 % (e, xml_content[:100], xml_content[-200:])