diff --git a/api/tests/test_skola_autocomplete.py b/api/tests/test_skola_autocomplete.py index 36df97e8..f69669f0 100644 --- a/api/tests/test_skola_autocomplete.py +++ b/api/tests/test_skola_autocomplete.py @@ -1,7 +1,6 @@ from django.test import TestCase, tag from django.urls import reverse import seminar.models as m -import seminar.views as v from seminar.utils import sync_skoly @tag('stejny-model-na-produkci') diff --git a/galerie/admin.py b/galerie/admin.py index 2b270163..0f8e6a42 100644 --- a/galerie/admin.py +++ b/galerie/admin.py @@ -1,6 +1,5 @@ from galerie.models import Obrazek, Galerie from django.contrib import admin -from django.http import HttpResponseRedirect from django import forms from django.db import models diff --git a/galerie/forms.py b/galerie/forms.py index e27b53fb..3a9ee4f9 100644 --- a/galerie/forms.py +++ b/galerie/forms.py @@ -1,5 +1,5 @@ from django import forms -from seminar.models import Soustredeni + class KomentarForm(forms.Form): komentar = forms.CharField(label = "Komentář:", max_length = 300, required=False) diff --git a/galerie/views.py b/galerie/views.py index 872bb46e..41d6d47d 100644 --- a/galerie/views.py +++ b/galerie/views.py @@ -1,9 +1,5 @@ -import random - -from django.http import HttpResponse, Http404 +from django.http import Http404 from django.shortcuts import render, HttpResponseRedirect, get_object_or_404 -from django.template import RequestContext -from datetime import datetime from galerie.models import Obrazek, Galerie from seminar.models import Soustredeni diff --git a/header_fotky/context_processors.py b/header_fotky/context_processors.py index 7f73faa7..7b7fe6ae 100644 --- a/header_fotky/context_processors.py +++ b/header_fotky/context_processors.py @@ -3,7 +3,7 @@ Context processory lze přidat do djanga v :mod:`~mamweb.settings` a dělají to že do contextu (tj. to, z čeho se např. berou proměnné v templatech) libovolné stránky přidají další věci. """ -from datetime import datetime, date +from datetime import datetime import random from django.conf import settings diff --git a/korektury/views.py b/korektury/views.py index ee6f2841..ea528e0a 100644 --- a/korektury/views.py +++ b/korektury/views.py @@ -8,9 +8,6 @@ from django.db.models import Count,Q from .models import Oprava,Komentar,KorekturovanePDF, Organizator from .forms import OpravaForm -import subprocess -import shutil -import os class KorekturyListView(generic.ListView): model = KorekturovanePDF diff --git a/mamweb/settings_local.py b/mamweb/settings_local.py index 4d98cd38..b45a5744 100644 --- a/mamweb/settings_local.py +++ b/mamweb/settings_local.py @@ -1,5 +1,3 @@ -import os.path - # # Lokalni / vyvojove nastaveni settings.py # @@ -10,6 +8,8 @@ import os.path # Import common settings from .settings_common import * +import os.path + MIDDLEWARE += ( 'debug_toolbar.middleware.DebugToolbarMiddleware', ) diff --git a/mamweb/settings_prod.py b/mamweb/settings_prod.py index 4a3f2198..81f6bb79 100644 --- a/mamweb/settings_prod.py +++ b/mamweb/settings_prod.py @@ -1,5 +1,3 @@ -import os.path - # # Produkcni nastaveni settings.py # @@ -10,6 +8,8 @@ import os.path # Import common settings from .settings_common import * +import os + # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ @@ -45,8 +45,6 @@ DATABASES = { }, } -import os - SERVER_EMAIL = 'mamweb-prod-errors@mam.mff.cuni.cz' ADMINS = [('M&M ERRORs', 'mam-errors@mam.mff.cuni.cz')] diff --git a/mamweb/settings_test.py b/mamweb/settings_test.py index 71f166ed..e1be6131 100644 --- a/mamweb/settings_test.py +++ b/mamweb/settings_test.py @@ -1,5 +1,3 @@ -import os.path - # # Testovaci nastaveni settings.py (testovani na atreyi) # @@ -49,8 +47,6 @@ DATABASES = { }, } -import os - SERVER_EMAIL = 'mamweb-test-errors@mam.mff.cuni.cz' ADMINS = [ ('M&M ERRORs', 'mam-errors@mam.mff.cuni.cz'), diff --git a/mamweb/urls.py b/mamweb/urls.py index 4b870fec..3bf929f1 100644 --- a/mamweb/urls.py +++ b/mamweb/urls.py @@ -7,9 +7,8 @@ from django.contrib import admin from django.conf import settings from django.views.generic.base import TemplateView from django import views -from django.urls import path # As per docs. -from treenode.routers import router +# from treenode.routers import router urlpatterns = [ diff --git a/odevzdavatko/views.py b/odevzdavatko/views.py index e5de47c2..d8f00f85 100644 --- a/odevzdavatko/views.py +++ b/odevzdavatko/views.py @@ -1,5 +1,4 @@ from django.core.exceptions import PermissionDenied -from django.views.generic import ListView, DetailView, FormView from django.contrib.auth.mixins import LoginRequiredMixin from django.core.mail import EmailMessage from django.utils import timezone @@ -11,8 +10,6 @@ from django.urls import reverse from django.db import transaction from django.db.models import Q -from dataclasses import dataclass -import datetime from decimal import Decimal from itertools import groupby import logging diff --git a/personalni/views.py b/personalni/views.py index c2712b30..0670261e 100644 --- a/personalni/views.py +++ b/personalni/views.py @@ -1,7 +1,7 @@ from django.shortcuts import render from django.urls import reverse from django.views import generic -from django.db.models import Q, Count, Min +from django.db.models import Q, Min from django.views.decorators.debug import sensitive_post_parameters from django.views.generic.base import TemplateView from django.contrib.auth.models import User, Permission, Group, AnonymousUser diff --git a/prednasky/views.py b/prednasky/views.py index 699b690d..e62f4d69 100644 --- a/prednasky/views.py +++ b/prednasky/views.py @@ -2,7 +2,6 @@ from django.shortcuts import render, get_object_or_404 from django.views import generic from django.shortcuts import HttpResponseRedirect from django.core.exceptions import ObjectDoesNotExist -from django.db.models import Sum from django.forms import Form from prednasky.models import Prednaska, Hlasovani, Seznam, STAV_NAVRH diff --git a/seminar/admin.py b/seminar/admin.py index f8768ddf..55195b75 100644 --- a/seminar/admin.py +++ b/seminar/admin.py @@ -3,7 +3,7 @@ from django.db import models from django.forms import widgets, ModelForm from django.core.exceptions import ValidationError -from polymorphic.admin import PolymorphicParentModelAdmin, PolymorphicChildModelAdmin, PolymorphicChildModelFilter +from polymorphic.admin import PolymorphicParentModelAdmin, PolymorphicChildModelAdmin from solo.admin import SingletonModelAdmin from django.utils.safestring import mark_safe diff --git a/seminar/management/commands/load_org_permissions.py b/seminar/management/commands/load_org_permissions.py index 6b4f9e0a..9211f900 100644 --- a/seminar/management/commands/load_org_permissions.py +++ b/seminar/management/commands/load_org_permissions.py @@ -1,5 +1,4 @@ from django.core.management.base import BaseCommand -from django.contrib.sessions.models import Session from django.contrib.auth.models import Group, Permission from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist diff --git a/seminar/management/commands/save_org_permissions.py b/seminar/management/commands/save_org_permissions.py index 216f9e4b..7ecbc01c 100644 --- a/seminar/management/commands/save_org_permissions.py +++ b/seminar/management/commands/save_org_permissions.py @@ -1,6 +1,5 @@ from django.core.management.base import BaseCommand -from django.contrib.sessions.models import Session -from django.contrib.auth.models import Group, Permission +from django.contrib.auth.models import Group import json class Command(BaseCommand): diff --git a/seminar/management/commands/testdata.py b/seminar/management/commands/testdata.py index d9ce8cfb..8613a157 100644 --- a/seminar/management/commands/testdata.py +++ b/seminar/management/commands/testdata.py @@ -1,12 +1,10 @@ -import datetime import os -import random from django.core.management.base import BaseCommand from django.core.management import call_command from django.conf import settings -from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni +from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni from seminar.testutils import create_test_data import django.contrib.auth User = django.contrib.auth.get_user_model() diff --git a/seminar/models/pomocne.py b/seminar/models/pomocne.py index ee71583f..f5327d4d 100644 --- a/seminar/models/pomocne.py +++ b/seminar/models/pomocne.py @@ -1,4 +1,3 @@ -import os from django.db import models from .base import SeminarModelBase diff --git a/seminar/models/tvorba.py b/seminar/models/tvorba.py index 36157c96..f988a089 100644 --- a/seminar/models/tvorba.py +++ b/seminar/models/tvorba.py @@ -10,15 +10,13 @@ from django.db import models from django.db.models import Q from django.template.loader import render_to_string from django.utils import timezone -from django.conf import settings from django.urls import reverse from django.core.cache import cache -from django.core.exceptions import ObjectDoesNotExist, ValidationError +from django.core.exceptions import ObjectDoesNotExist from django.core.files.storage import FileSystemStorage from django.utils.text import get_valid_filename from django.utils.functional import cached_property -from solo.models import SingletonModel from taggit.managers import TaggableManager from reversion import revisions as reversion diff --git a/seminar/templatetags/utils.py b/seminar/templatetags/utils.py index ca400050..c7b60173 100644 --- a/seminar/templatetags/utils.py +++ b/seminar/templatetags/utils.py @@ -1,7 +1,6 @@ from django import template from django.utils.safestring import mark_safe -from datetime import datetime, timedelta -from mamweb.settings import TIME_ZONE +from datetime import datetime import logging register = template.Library() diff --git a/seminar/testutils.py b/seminar/testutils.py index be7f3677..a282c214 100644 --- a/seminar/testutils.py +++ b/seminar/testutils.py @@ -10,7 +10,7 @@ import unidecode import logging from korektury.testutils import create_test_pdf -from seminar.models import Skola, Resitel, Rocnik, Cislo, Deadline, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Osoba, Organizator, Prijemce, Tema, Uloha, Konfera, TextNode, UlohaVzorakNode, RocnikNode, CisloNode, TemaVCisleNode, Text, Hodnoceni, UlohaZadaniNode, Novinky, TreeNode +from seminar.models import Skola, Resitel, Rocnik, Cislo, Deadline, Problem, Reseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Osoba, Organizator, Prijemce, Tema, Uloha, Konfera, TextNode, UlohaVzorakNode, RocnikNode, CisloNode, TemaVCisleNode, Text, Hodnoceni, UlohaZadaniNode, Novinky import seminar.models as m from django.contrib.flatpages.models import FlatPage diff --git a/seminar/urls.py b/seminar/urls.py index f740e6a4..e4280876 100644 --- a/seminar/urls.py +++ b/seminar/urls.py @@ -1,4 +1,4 @@ -from django.urls import path, include, re_path +from django.urls import path from . import views from .utils import org_required diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 2de84d30..0d8c7967 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -5,7 +5,7 @@ from django.core.exceptions import ObjectDoesNotExist from django.views import generic from django.utils.translation import gettext as _ from django.http import Http404 -from django.db.models import Q, Sum, Count +from django.db.models import Q from django.views.generic.base import RedirectView from django.core.exceptions import PermissionDenied from django.contrib.staticfiles.finders import find @@ -17,24 +17,18 @@ from seminar.models import Problem, Cislo, Reseni, Nastaveni, Rocnik, \ Deadline # Tohle je stare a chceme se toho zbavit. Pouzivejte s.ToCoChci #from .models import VysledkyZaCislo, VysledkyKCisluZaRocnik, VysledkyKCisluOdjakziva from seminar import utils -from treenode import treelib -import treenode.templatetags as tnltt -import treenode.serializers as vr from vysledkovky.utils import body_resitelu, VysledkovkaCisla, \ VysledkovkaRocniku, VysledkovkaDoTeXu -from datetime import date, datetime from django.utils import timezone from itertools import groupby from collections import OrderedDict import tempfile import subprocess import shutil -import os import os.path as op from django.conf import settings import unicodedata -import time from collections.abc import Sequence import http diff --git a/soustredeni/views.py b/soustredeni/views.py index f150b6b8..add79641 100644 --- a/soustredeni/views.py +++ b/soustredeni/views.py @@ -1,7 +1,6 @@ from django.shortcuts import get_object_or_404, render from django.http import HttpResponse from django.views import generic -from django.conf import settings from django.contrib.staticfiles.finders import find from seminar.models import Soustredeni, Resitel, Soustredeni_Ucastnici, Nastaveni # Tohle je stare a chceme se toho zbavit. Pouzivejte s.ToCoChci import csv diff --git a/treenode/admin.py b/treenode/admin.py index 92c85cd5..61b1f1e2 100644 --- a/treenode/admin.py +++ b/treenode/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from polymorphic.admin import PolymorphicParentModelAdmin, PolymorphicChildModelAdmin, PolymorphicChildModelFilter +from polymorphic.admin import PolymorphicParentModelAdmin, PolymorphicChildModelAdmin import seminar.models as m diff --git a/treenode/viewsets.py b/treenode/viewsets.py index 16dce6d6..66766492 100644 --- a/treenode/viewsets.py +++ b/treenode/viewsets.py @@ -1,8 +1,6 @@ -from rest_framework import viewsets,filters -from rest_framework import status -from rest_framework.response import Response +from rest_framework import viewsets from django.core.exceptions import PermissionDenied -from rest_framework.permissions import BasePermission, AllowAny +from rest_framework.permissions import AllowAny from seminar import models as m import treenode.serializers as views diff --git a/various/admin.py b/various/admin.py deleted file mode 100644 index 694323fa..00000000 --- a/various/admin.py +++ /dev/null @@ -1 +0,0 @@ -from django.contrib import admin