diff --git a/sapl/legacy/migration.py b/sapl/legacy/migration.py index 58d75994a..176044f52 100644 --- a/sapl/legacy/migration.py +++ b/sapl/legacy/migration.py @@ -4,9 +4,8 @@ from functools import lru_cache from subprocess import PIPE, call import pkg_resources -import yaml - import reversion +import yaml from django.apps import apps from django.apps.config import AppConfig from django.contrib.auth import get_user_model @@ -16,6 +15,7 @@ from django.core.exceptions import ObjectDoesNotExist from django.db import connections, transaction from django.db.models import Count, Max from django.db.models.base import ModelBase + from sapl.base.models import AppConfig as AppConf from sapl.base.models import (Autor, CasaLegislativa, ProblemaMigracao, TipoAutor) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 10f2d6e23..0f9d56ee2 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -1,6 +1,7 @@ import os +import django_filters from crispy_forms.bootstrap import Alert, FormActions, InlineRadios from crispy_forms.helper import FormHelper from crispy_forms.layout import (HTML, Button, Column, Div, Field, Fieldset, @@ -21,8 +22,8 @@ from django.utils.encoding import force_text from django.utils.html import format_html from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ -import django_filters +import sapl from sapl.base.models import Autor, TipoAutor from sapl.comissoes.models import Comissao from sapl.compilacao.models import (STATUS_TA_IMMUTABLE_PUBLIC, @@ -41,7 +42,6 @@ from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES, MateriaPesquisaOrderingFilter, RangeWidgetOverride, autor_label, autor_modal, models_with_gr_for_model, qs_override_django_filter) -import sapl from .models import (AcompanhamentoMateria, Anexada, Autoria, DespachoInicial, DocumentoAcessorio, Numeracao, Proposicao, Relatoria,