chore #3970 Clean up imports

Author: joemull

src/api/oai/views.py

@@ -2,8 +2,6 @@
 A django implementation of the OAI-PMH interface
 """
 
-import warnings
-
 from django.utils import timezone
 from django.views.generic.base import TemplateView
 

src/api/views.py

@@ -5,7 +5,6 @@
 import re
 import warnings
 
-from django.apps import apps
 from django.http import HttpResponse
 from django.shortcuts import render
 from django.utils import timezone
@@ -82,11 +81,14 @@ class JournalViewSet(viewsets.ModelViewSet):
     http_method_names = ["get"]
 
     def get_queryset(self):
-        Journal = apps.get_model("journal.Journal")
         if self.request.journal:
-            queryset = Journal.objects.filter(pk=self.request.journal.pk)
+            queryset = journal_models.Journal.objects.filter(
+                pk=self.request.journal.pk,
+            )
         else:
-            queryset = Journal.objects.filter(hide_from_press=False)
+            queryset = journal_models.Journal.objects.filter(
+                hide_from_press=False,
+            )
         return queryset
 
 
@@ -99,11 +101,14 @@ class IssueViewSet(viewsets.ModelViewSet):
     http_method_names = ["get"]
 
     def get_queryset(self):
-        Issue = apps.get_model("journal.Issue")
         if self.request.journal:
-            queryset = Issue.objects.filter(journal=self.request.journal)
+            queryset = journal_models.Issue.objects.filter(
+                journal=self.request.journal,
+            )
         else:
-            queryset = Issue.objects.filter(journal__hide_from_press=False)
+            queryset = journal_models.Issue.objects.filter(
+                journal__hide_from_press=False,
+            )
 
         return queryset
 

src/comms/views.py

@@ -1,6 +1,5 @@
 import urllib
 
-from django.apps import apps
 from django.shortcuts import render, get_object_or_404, redirect, Http404
 from django.urls import reverse
 from django.contrib import messages
@@ -10,6 +9,7 @@
 
 from comms import models, forms, logic
 from core import models as core_models
+from journal import models as journal_models
 from security.decorators import editor_user_required, file_user_required, has_request
 from utils.decorators import GET_language_override
 from utils.shared import language_override_redirect
@@ -212,10 +212,9 @@ def news_list(request, tag=None, presswide=False):
     all_tags = models.Tag.objects.all()
 
     if presswide or request.model_content_type.model == "press":
-        Journal = apps.get_model("journal.Journal")
         press_visible_journal_pks = [
             journal.pk
-            for journal in Journal.objects.filter(
+            for journal in journal_models.Journal.objects.filter(
                 hide_from_press=False,
             )
         ]

src/identifiers/logic.py

@@ -11,7 +11,6 @@
 import time
 import itertools
 
-from django.apps import apps
 from django.urls import reverse
 from django.template.loader import render_to_string
 from django.utils.http import urlencode
@@ -28,7 +27,7 @@
 from utils import setting_handler, render_template
 from crossref.restful import Depositor
 from identifiers import models
-from submission import models as submission_models
+from journal import models as journal_models
 
 logger = get_logger(__name__)
 
@@ -51,8 +50,7 @@ def register_batch_of_crossref_dois(articles, **kwargs):
 
     use_crossref, test_mode, missing_settings = check_crossref_settings(journal)
 
-    Journal = apps.get_model("journal.Journal")
-    if journal.status == Journal.PublishingStatus.TEST:
+    if journal.status == journal_models.Journal.PublishingStatus.TEST:
         test_mode = True
 
     if use_crossref and not missing_settings:

src/themes/OLH/templates/press/press_journal_set.html

@@ -2,7 +2,6 @@
 {% load static %}
 
 {% for journal in journals %}
-    {% setting_var journal 'disable_journal_submission' as submission_disabled %}
     <div class="large-12 columns border-right border-bottom journal-div">
         <div class="box journal">
             <div class="row collapse">
@@ -45,7 +44,7 @@ <h3>{% trans 'Disciplines' %}</h3>
                             </div>
                             <div class="expanded button-group">
                                 {% if journal.is_remote %}
-                                    {% if not submission_disabled %}
+                                    {% if not journal_settings.general.disable_journal_submission %}
                                         <a href="{{ journal.remote_submit_url }}"
                                             class="button" 
                                             target="_blank"
@@ -62,7 +61,7 @@ <h3>{% trans 'Disciplines' %}</h3>
                                             {% include "elements/icons/link_external.html" %} 
                                         </a>
                                 {% else %}
-                                    {% if not submission_disabled %}
+                                    {% if not journal_settings.general.disable_journal_submission %}
                                     <a href="{% journal_base_url journal %}{% url 'submission_start' %}"
                                        class="button"><span>{% trans 'Submit' %}</span></a>
                                     {% endif %}

src/utils/logic.py

@@ -3,7 +3,6 @@
 import hmac
 from urllib.parse import SplitResult, urlencode, urlparse, unquote
 
-from django.apps import apps
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.http import QueryDict