From 24acd451ad2b4a0d08f1b5d0d06c7b301c4eb387 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 22 Oct 2022 18:35:31 +0200 Subject: [PATCH] code style improvements in pdf exporter --- pretalx_broadcast_tools/exporter.py | 23 +++++++++++++++++------ pretalx_broadcast_tools/signals.py | 1 + 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/pretalx_broadcast_tools/exporter.py b/pretalx_broadcast_tools/exporter.py index f861979..589d54c 100644 --- a/pretalx_broadcast_tools/exporter.py +++ b/pretalx_broadcast_tools/exporter.py @@ -1,10 +1,7 @@ from tempfile import NamedTemporaryFile -from django.http import HttpResponse from django.utils.timezone import now from pretalx.schedule.exporters import ScheduleData -from pretalx.submission.models import SubmissionStates -from reportlab.graphics import renderPDF from reportlab.lib import colors from reportlab.lib.enums import TA_CENTER from reportlab.lib.pagesizes import A4 @@ -13,7 +10,6 @@ from reportlab.lib.units import mm from reportlab.platypus import ( Flowable, PageBreak, - PageTemplate, Paragraph, SimpleDocTemplate, Spacer, @@ -63,7 +59,16 @@ class PDFInfoPage(Flowable): self.canv.drawString( -(A4_HEIGHT - (PAGE_PADDING / 3)), -(PAGE_PADDING / 3), - f"{self.talk.submission.code} | {self.talk.submission.submission_type.name} | {self.event.name} | {self.talk.local_start.isoformat()} | Day {self.day['index']} | {self.room['name']}", + " | ".join( + [ + self.talk.submission.code, + str(self.talk.submission.submission_type.name), + str(self.event.name), + self.talk.local_start.isoformat(), + f"Day {self.day['index']}", + str(self.room["name"]), + ], + ), ) self.canv.restoreState() @@ -76,7 +81,13 @@ class PDFInfoPage(Flowable): self._add( Paragraph( - f"{self.event.name} | {self.room['name']} | {self.talk.local_start.strftime('%F %T')} {self.event.timezone}", + " | ".join( + [ + str(self.event.name), + str(self.room["name"]), + f"{self.talk.local_start.strftime('%F %T')} {self.event.timezone}", + ], + ), style=self.style["Meta"], ) ) diff --git a/pretalx_broadcast_tools/signals.py b/pretalx_broadcast_tools/signals.py index cc527db..2767d04 100644 --- a/pretalx_broadcast_tools/signals.py +++ b/pretalx_broadcast_tools/signals.py @@ -40,4 +40,5 @@ def navbar_info(sender, request, **kwargs): @receiver(register_data_exporters, dispatch_uid="exporter_myexporter") def register_data_exporter(sender, **kwargs): from .exporter import PDFExporter + return PDFExporter