Replace deprecated pypdf.PdfMerger with pypdf.PdfWriter (#3383)

This commit is contained in:
Richard Schreiber
2023-06-05 09:32:03 +02:00
committed by GitHub
parent 35350a13d6
commit 8f17b338d1
3 changed files with 6 additions and 6 deletions

View File

@@ -51,7 +51,7 @@ from django.db.models import Case, Exists, OuterRef, Q, Subquery, When
from django.db.models.functions import Cast, Coalesce
from django.utils.timezone import make_aware
from django.utils.translation import gettext as _, gettext_lazy, pgettext_lazy
from pypdf import PdfMerger, PdfReader, PdfWriter, Transformation
from pypdf import PdfReader, PdfWriter, Transformation
from pypdf.generic import RectangleObject
from reportlab.lib import pagesizes
from reportlab.lib.units import mm
@@ -196,7 +196,7 @@ def render_pdf(event, positions, opt):
raise ExportError(_("None of the selected products is configured to print badges."))
# render each badge on its own page first
merger = PdfMerger()
merger = PdfWriter()
merger.add_metadata({
'/Title': 'Badges',
'/Creator': 'pretix',

View File

@@ -43,7 +43,7 @@ from django.db.models import Case, OuterRef, Q, Subquery, When
from django.db.models.functions import Cast, Coalesce
from django.utils.timezone import now
from django.utils.translation import gettext as _, gettext_lazy, pgettext_lazy
from pypdf import PdfMerger
from pypdf import PdfWriter
from pretix.base.exporter import BaseExporter
from pretix.base.i18n import language
@@ -117,7 +117,7 @@ class AllTicketsPDF(BaseExporter):
return d
def render(self, form_data):
merger = PdfMerger()
merger = PdfWriter()
qs = OrderPosition.objects.filter(
order__event__in=self.events
).prefetch_related(

View File

@@ -44,7 +44,7 @@ from django.http import HttpRequest
from django.template.loader import get_template
from django.utils.functional import cached_property
from django.utils.translation import gettext_lazy as _
from pypdf import PdfMerger
from pypdf import PdfWriter
from pretix.base.i18n import language
from pretix.base.models import Order, OrderPosition
@@ -113,7 +113,7 @@ class PdfTicketOutput(BaseTicketOutput):
return renderer.render_background(buffer, _('Ticket'))
def generate_order(self, order: Order):
merger = PdfMerger()
merger = PdfWriter()
with language(order.locale, self.event.settings.region):
for op in order.positions_with_tickets:
layout = override_layout.send_chained(