cleanup, reorder import

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 7987cf644b1e2b501a042b9d24e4cb796b9e150a..e8bb8298d683d953bcc31d79209c8586eb45a0cb 100644 (file)
--- 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 3a55c397e1587007fbef38daddd134f48f61ff89..3c697c78d9a5b6e3d2299b44d6b8a0fc63903dfb 100644 (file)
--- 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):