From 5d7860ac7a3f848f6a55852f900a1565552236dc Mon Sep 17 00:00:00 2001 From: "J.-S. Caux" <J.S.Caux@uva.nl> Date: Tue, 29 Mar 2016 09:27:35 +0200 Subject: [PATCH] Remove import alls from commentaries --- commentaries/admin.py | 2 +- commentaries/forms.py | 3 ++- commentaries/models.py | 8 +++++--- commentaries/views.py | 10 +++++----- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/commentaries/admin.py b/commentaries/admin.py index 4d6b152ba..d412cd35a 100644 --- a/commentaries/admin.py +++ b/commentaries/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from commentaries.models import * +from commentaries.models import Commentary class CommentaryAdmin(admin.ModelAdmin): diff --git a/commentaries/forms.py b/commentaries/forms.py index c1626ab06..58208451a 100644 --- a/commentaries/forms.py +++ b/commentaries/forms.py @@ -1,6 +1,7 @@ from django import forms -from .models import * +from .models import Commentary + COMMENTARY_ACTION_CHOICES = ( (0, 'modify'), diff --git a/commentaries/models.py b/commentaries/models.py index d22ff7fc8..0c179327d 100644 --- a/commentaries/models.py +++ b/commentaries/models.py @@ -2,10 +2,12 @@ from django.utils import timezone from django.db import models from django.contrib.auth.models import User -from .models import * -from journals.models import * -from scipost.models import * +from journals.models import SCIPOST_JOURNALS_DOMAINS, SCIPOST_JOURNALS_SPECIALIZATIONS +from scipost.models import Contributor +from scipost.models import SCIPOST_DISCIPLINES + + COMMENTARY_TYPES = ( ('published', 'published paper'), diff --git a/commentaries/views.py b/commentaries/views.py index 4e59aa145..64d1256e0 100644 --- a/commentaries/views.py +++ b/commentaries/views.py @@ -9,16 +9,16 @@ from django.http import HttpResponse, HttpResponseRedirect from django.views.decorators.csrf import csrf_protect from django.db.models import Avg -from .models import * -from .forms import * +from .models import Commentary +from .forms import RequestCommentaryForm, VetCommentaryForm, CommentarySearchForm from comments.models import Comment from comments.forms import CommentForm -from scipost.forms import TITLE_CHOICES, AuthenticationForm#, OpinionForm +from scipost.models import Contributor +from scipost.models import title_dict +from scipost.forms import AuthenticationForm -title_dict = dict(TITLE_CHOICES) # Convert titles for use in emails - ################ # Commentaries ################ -- GitLab