From 9f8d9ee541eea8ba186928d61d6091051e632b9c Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 18 Apr 2024 08:20:28 +0200 Subject: [PATCH] cleanup, reorder import --- teleforma/models/core.py | 9 +++++---- teleforma/views/core.py | 13 +++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/teleforma/models/core.py b/teleforma/models/core.py index 7987cf64..e8bb8298 100644 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -41,7 +41,6 @@ import string import random import requests import asyncio -from teleforma.utils import guess_mimetypes import django.db.models as models from django.conf import settings @@ -54,11 +53,14 @@ from django.urls import reverse_lazy, reverse from django.utils.translation import ugettext_lazy as _ from django.db.models.signals import post_save # from quiz.models import Quiz -from sorl.thumbnail import default as sorl_default +from teleforma.utils import guess_mimetypes +from ..fields import ShortTextField + +from sorl.thumbnail import default as sorl_default +from pypdf import PdfWriter import httpx -from ..fields import ShortTextField HAS_TELEMETA = False if 'telemeta' in settings.INSTALLED_APPS: @@ -849,7 +851,6 @@ class DocumentPrivate(MediaBase): def save(self, **kwargs): if "pdf" in self.document.mime_type: - from pypdf import PdfReader, PdfWriter writer = PdfWriter(clone_from=self.document.file.path) writer.add_metadata({"/Downloader": self.user.username}) writer.add_metadata({"/Publisher": settings.TELEFORMA_ORGANIZATION}) diff --git a/teleforma/views/core.py b/teleforma/views/core.py index 3a55c397..3c697c78 100644 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@ -37,8 +37,8 @@ import os import requests from html import escape from io import BytesIO +import logging -import weasyprint from django.conf import settings from django.contrib import messages from django.contrib.auth.decorators import login_required, permission_required @@ -61,13 +61,14 @@ from django.core.cache import cache from jsonrpc import jsonrpc_method from jsonrpc.proxy import ServiceProxy + from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response from rest_framework.views import APIView + from teleforma.models.crfpa import Home, Student, Training from teleforma.models.notification import Notification, notify from teleforma.utils import guess_mimetypes - from ..decorators import access_required from ..models.appointment import Appointment, AppointmentPeriod from ..models.chat import ChatMessage @@ -79,13 +80,9 @@ from ..models.core import (Conference, ConferencePublication, Course, CourseType from ..webclass.models import Webclass, WebclassRecord from .pages import get_page_content -import logging -logger = logging.getLogger('teleforma') -# def render(request, template, data=None, mimetype=None): -# return django_render(template, data, context_instance=RequestContext(request), -# mimetype=mimetype) +import weasyprint -# CACHE_TIMEOUT = getattr(settings, 'CACHE_TIMEOUT', 60*60) +logger = logging.getLogger('teleforma') def format_courses(courses, course=None, queryset=None, types=None): -- 2.39.5