wbwriter 1.55.9__tar.gz → 1.55.10rc0__tar.gz

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbwriter
-Version: 1.55.9
+Version: 1.55.10rc0
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: reportlab==3.*
 Requires-Dist: wbcore

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/wbwriter/models/article.py

@@ -39,7 +39,7 @@ from weasyprint import CSS
 
 from wbwriter.models.publication_models import Publication
 from wbwriter.pdf_generator import PdfGenerator
-from wbwriter.publication_parser import ParserValidationException
+from wbwriter.publication_parser import ParserValidationError
 from wbwriter.typings import ArticleDTO
 
 from .mixins import PublishableMixin
@@ -167,7 +167,7 @@ class DependantArticle(WBModel):
     )
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbwriter:dependantarticle"
 
     @classmethod
@@ -789,7 +789,7 @@ class Article(CloneMixin, TagModelMixin, PublishableMixin, WBModel):
                         self._build_dto(),
                         date.today(),
                     ).is_valid()
-                except ParserValidationException as e:
+                except ParserValidationError as e:
                     errors["non_field_errors"] = e.errors
                 except ModuleNotFoundError:
                     errors["non_field_errors"] = [gettext_lazy("invalid parser")]
@@ -1175,7 +1175,7 @@ class Article(CloneMixin, TagModelMixin, PublishableMixin, WBModel):
         return mapping
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbwriter:article"
 
     @classmethod

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/wbwriter/models/article_type.py

@@ -32,7 +32,7 @@ class ArticleType(WBModel):
     qa_reviewers = models.ManyToManyField("directory.Person", related_name="article_type_qa_reviewers")
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbwriter:articletyperepresentation"
 
     @classmethod

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/wbwriter/models/in_editor_template.py

@@ -86,7 +86,7 @@ class InEditorTemplate(WBModel):
         return self.title
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbwriter:in-editor-template"
 
     @classmethod

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/wbwriter/models/meta_information.py

@@ -24,7 +24,7 @@ class MetaInformation(WBModel):
         verbose_name_plural = "Meta Information"
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbwriter:metainformation"
 
     @classmethod
@@ -60,7 +60,7 @@ class MetaInformationInstance(WBModel):
         ]
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbwriter:metainformationinstance"
 
     @classmethod

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/wbwriter/models/publication_models.py

@@ -77,6 +77,9 @@ class Publication(TagModelMixin, models.Model):
     object_id = models.PositiveIntegerField()
     content_object = GenericForeignKey("content_type", "object_id")
 
+    def __str__(self) -> str:
+        return self.title
+
     @classmethod
     def create_or_update_from_parser_and_object(cls, parser, generic_object):
         if hasattr(generic_object, "_build_dto") and callable(generic_object._build_dto):
@@ -91,7 +94,7 @@ class Publication(TagModelMixin, models.Model):
             pub.save()
 
     @classmethod
-    def get_endpoint_basename(self):
+    def get_endpoint_basename(cls):
         return "wbwriter:publication"
 
     @classmethod

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/wbwriter/pdf_generator.py

@@ -31,7 +31,7 @@ class PdfGenerator:
         main_html,
         header_html=None,
         footer_html=None,
-        custom_css=[],
+        custom_css=None,
         base_url=None,
         side_margin=2,
         extra_vertical_margin=30,
@@ -61,7 +61,7 @@ class PdfGenerator:
         self.main_html = main_html
         self.header_html = header_html
         self.footer_html = footer_html
-        self.custom_css = custom_css
+        self.custom_css = custom_css if custom_css else []
         self.base_url = base_url
         self.side_margin = side_margin
         self.extra_vertical_margin = extra_vertical_margin

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/wbwriter/publication_parser.py

@@ -1,6 +1,5 @@
 import json
 import os
-from abc import ABC
 from datetime import date
 from io import BytesIO
 from typing import Iterable
@@ -17,12 +16,12 @@ from wbwriter.pdf_generator import PdfGenerator
 from .typings import ArticleDTO
 
 
-class ParserValidationException(Exception):
+class ParserValidationError(Exception):
     def __init__(self, *args, errors=None, **kwargs):  # real signature unknown
         self.errors = errors
 
 
-class PublicationParser(ABC):  # pragma: no cover
+class PublicationParser:  # pragma: no cover
     def __init__(self, article: ArticleDTO, published_date: date):
         self.article = article
         self.published_date = published_date
@@ -64,7 +63,7 @@ class PublicationParser(ABC):  # pragma: no cover
         self._errors = []
         is_valid = self._is_valid()
         if self.errors and raise_exception:
-            raise ParserValidationException(errors=self.errors)
+            raise ParserValidationError(errors=self.errors)
         return is_valid
 
     def _get_additional_information(self) -> dict[str, any]:

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/wbwriter/serializers/article.py

@@ -7,6 +7,7 @@ from wbcore.contrib.directory.serializers import (
     InternalUserProfileRepresentationSerializer,
 )
 from wbcore.contrib.documents.models import Document
+from wbcore.contrib.i18n.serializers.mixins import ModelTranslateSerializerMixin
 from wbcore.contrib.tags.serializers import TagSerializerMixin
 from wbcore.serializers import (
     HyperlinkField,
@@ -58,9 +59,6 @@ class DependantArticleModelSerializer(ModelSerializer):
         )
 
 
-from wbcore.contrib.i18n.serializers.mixins import ModelTranslateSerializerMixin
-
-
 class ArticleModelSerializer(ModelTranslateSerializerMixin, TagSerializerMixin, ModelSerializer):
     """Serializes a subset of the fields of of the Article model to minimize
     workload on serializing lists of instances.

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/wbwriter/tests/signals.py

@@ -1,6 +1,7 @@
 from django.dispatch import receiver
 from dynamic_preferences.registries import global_preferences_registry
 from wbcore.test.signals import custom_update_kwargs
+
 from wbwriter.models import Article
 from wbwriter.viewsets import ArticleModelViewSet, ReviewerArticleModelViewSet
 

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/wbwriter/tests/test_filter.py

@@ -1,6 +1,7 @@
 import pytest
 from rest_framework.test import APIRequestFactory
 from wbcore.contrib.authentication.factories import InternalUserFactory
+
 from wbwriter.factories import ArticleFactory, MetaInformationInstanceFactory
 from wbwriter.filters import MetaInformationInstanceFilter
 from wbwriter.models import MetaInformationInstance

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/wbwriter/tests/test_model.py

@@ -5,6 +5,7 @@ from django.forms.models import model_to_dict
 from django_fsm import has_transition_perm
 from wbcore.contrib.authentication.factories import UserFactory
 from wbcore.contrib.authentication.models import Permission, User
+
 from wbwriter.factories import (
     ArticleFactory,
     ArticleTypeFactory,

{wbwriter-1.55.9 → wbwriter-1.55.10rc0}/wbwriter/tests/test_writer.py

@@ -1,4 +1,5 @@
 import pytest
+
 from wbwriter.templatetags.writer import cite_article, table_of_contents