Browse Source

Remove unused imports via autoflake8

upgrade-sapl
Edward Ribeiro 2 months ago
parent
commit
a8af619c9f
  1. 1
      docker/startup_scripts/gunicorn.conf.py
  2. 2
      drfautoapi/drfautoapi.py
  3. 2
      sapl/api/apps.py
  4. 1
      sapl/api/forms.py
  5. 3
      sapl/api/views_audiencia.py
  6. 1
      sapl/api/views_base.py
  7. 3
      sapl/api/views_compilacao.py
  8. 3
      sapl/api/views_materia.py
  9. 5
      sapl/api/views_norma.py
  10. 3
      sapl/api/views_painel.py
  11. 3
      sapl/api/views_protocoloadm.py
  12. 5
      sapl/audiencia/forms.py
  13. 5
      sapl/audiencia/models.py
  14. 2
      sapl/audiencia/tests/test_audiencia.py
  15. 3
      sapl/audiencia/urls.py
  16. 2
      sapl/base/admin.py
  17. 2
      sapl/base/apps.py
  18. 2
      sapl/base/email_utils.py
  19. 27
      sapl/base/forms.py
  20. 1
      sapl/base/migrations/0001_initial.py
  21. 4
      sapl/base/models.py
  22. 3
      sapl/base/receivers.py
  23. 1
      sapl/base/search_indexes.py
  24. 2
      sapl/base/tests/test_view_base.py
  25. 3
      sapl/comissoes/tests/test_comissoes.py
  26. 14
      sapl/comissoes/views.py
  27. 1
      sapl/compilacao/forms.py
  28. 2
      sapl/compilacao/migrations/0007_auto_20180911_1600.py
  29. 3
      sapl/compilacao/migrations/0012_bug_auto_inserido.py
  30. 2
      sapl/compilacao/models.py
  31. 3
      sapl/compilacao/tests/test_tipo_texto_articulado_form.py
  32. 7
      sapl/compilacao/views.py
  33. 2
      sapl/crispy_layout_mixin.py
  34. 3
      sapl/crud/base.py
  35. 7
      sapl/materia/forms.py
  36. 1
      sapl/materia/migrations/0013_adiciona_status_tramitacao.py
  37. 2
      sapl/materia/migrations/0087_update_viewdb_materiaemtramitacao.py
  38. 1
      sapl/materia/tests/test_materia.py
  39. 11
      sapl/materia/views.py
  40. 1
      sapl/norma/urls.py
  41. 7
      sapl/norma/views.py
  42. 4
      sapl/painel/views.py
  43. 1
      sapl/parlamentares/migrations/0023_auto_20180626_1524.py
  44. 2
      sapl/parlamentares/migrations/0037_atribuiMesaDiretora.py
  45. 1
      sapl/parlamentares/models.py
  46. 21
      sapl/parlamentares/urls.py
  47. 5
      sapl/parlamentares/views.py
  48. 9
      sapl/protocoloadm/views.py
  49. 1
      sapl/relatorios/templates/pdf_capa_processo_preparar_pysc.py
  50. 1
      sapl/relatorios/templates/pdf_detalhe_materia_preparar_pysc.py
  51. 1
      sapl/relatorios/templates/pdf_documento_administrativo_preparar_pysc.py
  52. 1
      sapl/relatorios/templates/pdf_espelho_preparar_pysc.py
  53. 1
      sapl/relatorios/templates/pdf_etiqueta_protocolo_preparar_pysc.py
  54. 1
      sapl/relatorios/templates/pdf_materia_preparar_pysc.py
  55. 1
      sapl/relatorios/templates/pdf_norma_preparar_pysc.py
  56. 1
      sapl/relatorios/templates/pdf_ordem_dia_preparar_pysc.py
  57. 1
      sapl/relatorios/templates/pdf_pauta_sessao_preparar_pysc.py
  58. 1
      sapl/relatorios/templates/pdf_protocolo_preparar_pysc.py
  59. 2
      sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py
  60. 1
      sapl/relatorios/templates/pdf_sessao_plenaria_preparar_pysc.py
  61. 1
      sapl/rules/management/commands/check_ids_sequences.py
  62. 11
      sapl/sessao/forms.py
  63. 1
      sapl/sessao/migrations/0005_auto_20170601_1246.py
  64. 2
      sapl/sessao/serializers.py
  65. 18
      sapl/sessao/tests/test_sessao_view.py
  66. 12
      sapl/sessao/views.py
  67. 1
      sapl/settings.py
  68. 1
      sapl/test_urls.py
  69. 4
      sapl/utils.py

1
docker/startup_scripts/gunicorn.conf.py

@ -1,6 +1,5 @@
# /var/interlegis/sapl/gunicorn.conf.py
import os
import pathlib
import multiprocessing

2
drfautoapi/drfautoapi.py

@ -4,8 +4,6 @@ import inspect
import logging
import re
from django.apps.config import AppConfig
from django.apps.registry import apps
from django.conf import settings
from django.db.models import JSONField
from django.db.models.base import ModelBase

2
sapl/api/apps.py

@ -8,4 +8,4 @@ class AppConfig(apps.AppConfig):
verbose_name = _("API Rest")
def ready(self):
from . import signals
pass

1
sapl/api/forms.py

@ -4,7 +4,6 @@ from django.db.models import Q
from django.utils import timezone
from django.utils.translation import gettext_lazy as _
from django_filters.filters import CharFilter, DateFilter, ModelChoiceFilter
from django_filters.filterset import FilterSet
from rest_framework import serializers
from drfautoapi.drfautoapi import ApiFilterSetMixin

3
sapl/api/views_audiencia.py

@ -1,7 +1,6 @@
from django.apps.registry import apps
from drfautoapi.drfautoapi import (ApiViewSetConstrutor, customize,
wrapper_queryset_response_for_drf_action)
from drfautoapi.drfautoapi import ApiViewSetConstrutor
AudienciaApiViewSetConstrutor = ApiViewSetConstrutor.build_class(
[apps.get_app_config("audiencia")]

1
sapl/api/views_base.py

@ -115,7 +115,6 @@ class _AutorViewSet:
params["id"] = tipo
except Exception as e:
logger.error("user= " + username + ". " + str(e))
pass
tipos = TipoAutor.objects.filter(**params)

3
sapl/api/views_compilacao.py

@ -1,6 +1,5 @@
from django.apps.registry import apps
from drfautoapi.drfautoapi import (ApiViewSetConstrutor, customize,
wrapper_queryset_response_for_drf_action)
from drfautoapi.drfautoapi import ApiViewSetConstrutor
ApiViewSetConstrutor.build_class([apps.get_app_config("compilacao")])

3
sapl/api/views_materia.py

@ -3,8 +3,7 @@ from django.db.models import Q
from rest_framework.decorators import action
from rest_framework.response import Response
from drfautoapi.drfautoapi import (ApiViewSetConstrutor, customize,
wrapper_queryset_response_for_drf_action)
from drfautoapi.drfautoapi import (ApiViewSetConstrutor, customize)
from sapl.api.permissions import SaplModelPermissions
from sapl.materia.models import (MateriaLegislativa, Proposicao,
TipoMateriaLegislativa, Tramitacao)

5
sapl/api/views_norma.py

@ -1,8 +1,5 @@
from django.apps.registry import apps
from rest_framework.decorators import action
from drfautoapi.drfautoapi import (ApiViewSetConstrutor, customize,
wrapper_queryset_response_for_drf_action)
from sapl.norma.models import NormaJuridica
from drfautoapi.drfautoapi import ApiViewSetConstrutor
ApiViewSetConstrutor.build_class([apps.get_app_config("norma")])

3
sapl/api/views_painel.py

@ -1,6 +1,5 @@
from django.apps.registry import apps
from drfautoapi.drfautoapi import (ApiViewSetConstrutor, customize,
wrapper_queryset_response_for_drf_action)
from drfautoapi.drfautoapi import ApiViewSetConstrutor
ApiViewSetConstrutor.build_class([apps.get_app_config("painel")])

3
sapl/api/views_protocoloadm.py

@ -1,7 +1,6 @@
from django.apps.registry import apps
from drfautoapi.drfautoapi import (ApiViewSetConstrutor, customize,
wrapper_queryset_response_for_drf_action)
from drfautoapi.drfautoapi import (ApiViewSetConstrutor, customize)
from sapl.api.permissions import SaplModelPermissions
from sapl.base.models import DOC_ADM_OSTENSIVO, AppConfig
from sapl.protocoloadm.models import (Anexado,

5
sapl/audiencia/forms.py

@ -1,16 +1,15 @@
import logging
from datetime import datetime
from crispy_forms.layout import HTML, Button, Column, Fieldset, Layout
from crispy_forms.layout import Fieldset
from django import forms
from django.core.exceptions import ObjectDoesNotExist, ValidationError
from django.db import transaction
from django.utils.translation import gettext_lazy as _
from sapl.audiencia.models import (AnexoAudienciaPublica, AudienciaPublica,
TipoAudienciaPublica)
from sapl.crispy_layout_mixin import (SaplFormHelper, SaplFormLayout,
form_actions, to_row)
to_row)
from sapl.materia.models import MateriaLegislativa, TipoMateriaLegislativa
from sapl.parlamentares.models import Parlamentar
from sapl.utils import FileFieldCheckMixin, timezone, validar_arquivo

5
sapl/audiencia/models.py

@ -4,10 +4,9 @@ from django.utils.translation import gettext_lazy as _
from model_utils import Choices
from sapl.materia.models import MateriaLegislativa
from sapl.parlamentares.models import CargoMesa, Parlamentar
from sapl.parlamentares.models import Parlamentar
from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES, OverwriteStorage,
SaplGenericRelation, restringe_tipos_de_arquivo_txt,
texto_upload_path)
restringe_tipos_de_arquivo_txt, texto_upload_path)
def get_audiencia_media_path(instance, subpath, filename):

2
sapl/audiencia/tests/test_audiencia.py

@ -7,7 +7,7 @@ from model_bakery import baker
from sapl.audiencia import forms
from sapl.audiencia.models import (AnexoAudienciaPublica, AudienciaPublica,
TipoAudienciaPublica)
from sapl.materia.models import MateriaLegislativa, TipoMateriaLegislativa
from sapl.materia.models import TipoMateriaLegislativa
@pytest.mark.django_db(transaction=False)

3
sapl/audiencia/urls.py

@ -1,7 +1,6 @@
from django.urls import include, path
from sapl.audiencia.views import (AnexoAudienciaPublicaCrud, AudienciaCrud,
index)
from sapl.audiencia.views import (AnexoAudienciaPublicaCrud, AudienciaCrud)
from .apps import AppConfig

2
sapl/base/admin.py

@ -1,6 +1,4 @@
from django.contrib import admin
from django.shortcuts import redirect
from django.utils.translation import gettext_lazy as _
from sapl.base.models import AuditLog
from sapl.utils import register_all_models_in_admin

2
sapl/base/apps.py

@ -8,4 +8,4 @@ class AppConfig(django.apps.AppConfig):
verbose_name = _("Dados Básicos")
def ready(self):
from sapl.base import receivers
pass

2
sapl/base/email_utils.py

@ -2,7 +2,7 @@ import logging
from datetime import datetime as dt
from django.core.mail import EmailMultiAlternatives, get_connection, send_mail
from django.template import Context, loader
from django.template import loader
from django.urls import reverse
from django.utils import timezone
from django.utils.translation import gettext_lazy as _

27
sapl/base/forms.py

@ -1,12 +1,10 @@
import logging
import os
import django_filters
from crispy_forms.bootstrap import (FieldWithButtons, FormActions,
InlineRadios, StrictButton)
from crispy_forms.helper import FormHelper
from crispy_forms.layout import (HTML, Button, Div, Field, Fieldset, Layout,
Row, Submit)
StrictButton)
from crispy_forms.layout import (HTML, Div, Field, Fieldset, Layout, Row,
Submit)
from django import forms
from django.conf import settings
from django.contrib.auth import get_user_model, password_validation
@ -14,7 +12,7 @@ from django.contrib.auth.forms import (AuthenticationForm, PasswordResetForm,
SetPasswordForm)
from django.contrib.auth.models import Group, Permission, User
from django.core.exceptions import ValidationError
from django.db import models, transaction
from django.db import transaction
from django.db.models import Q
from django.forms import Form, ModelForm
from django.utils import timezone
@ -22,29 +20,18 @@ from django.utils.safestring import mark_safe
from django.utils.translation import gettext_lazy as _
from haystack.forms import ModelSearchForm
from sapl.audiencia.models import AudienciaPublica
from sapl.base.models import AuditLog, Autor, OperadorAutor, TipoAutor
from sapl.comissoes.models import Reuniao
from sapl.crispy_layout_mixin import (SaplFormHelper, SaplFormLayout,
form_actions, to_column, to_row)
from sapl.materia.models import (DocumentoAcessorio, MateriaEmTramitacao,
MateriaLegislativa, StatusTramitacao,
UnidadeTramitacao)
from sapl.norma.models import NormaEstatisticas, NormaJuridica
from sapl.norma.models import NormaEstatisticas
from sapl.parlamentares.models import (Parlamentar, Partido, SessaoLegislativa,
Votante)
from sapl.protocoloadm.models import DocumentoAdministrativo
from sapl.rules import SAPL_GROUP_AUTOR, SAPL_GROUP_VOTANTE
from sapl.sessao.models import SessaoPlenaria
from sapl.settings import MAX_IMAGE_UPLOAD_SIZE
from sapl.utils import (RANGE_ANOS, RANGE_MESES, YES_NO_CHOICES,
ChoiceWithoutValidationField, FileFieldCheckMixin,
FilterOverridesMetaMixin, GoogleRecapthaMixin,
ImageThumbnailFileInput, autor_label, autor_modal,
choice_anos_com_materias, choice_anos_com_normas,
choice_tipos_normas, delete_cached_entry,
is_weak_password, parlamentares_ativos,
qs_override_django_filter)
GoogleRecapthaMixin, ImageThumbnailFileInput,
delete_cached_entry, is_weak_password, parlamentares_ativos)
from .models import AppConfig, CasaLegislativa

1
sapl/base/migrations/0001_initial.py

@ -5,7 +5,6 @@ from __future__ import unicode_literals
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import sapl.base.models
class Migration(migrations.Migration):

4
sapl/base/models.py

@ -5,12 +5,10 @@ from django.core.serializers.json import DjangoJSONEncoder
from django.db import models
from django.db.models import JSONField
from django.db.models.deletion import CASCADE
from django.db.models.signals import post_migrate
from django.db.utils import DEFAULT_DB_ALIAS
from django.utils.translation import gettext_lazy as _
from sapl.utils import (LISTA_DE_UFS, YES_NO_CHOICES,
get_settings_auth_user_model, models_with_gr_for_model)
get_settings_auth_user_model)
DOC_ADM_OSTENSIVO = "O"
DOC_ADM_RESTRITIVO = "R"

3
sapl/base/receivers.py

@ -6,7 +6,7 @@ from asn1crypto import cms
from django.conf import settings
from django.contrib.contenttypes.models import ContentType
from django.core import serializers
from django.core.files.uploadedfile import InMemoryUploadedFile, UploadedFile
from django.core.files.uploadedfile import UploadedFile
from django.db.models.fields.files import FileField
from django.db.models.signals import (post_delete, post_migrate, post_save,
pre_migrate, pre_save)
@ -20,7 +20,6 @@ from sapl.base.email_utils import do_envia_email_tramitacao
from sapl.base.models import AuditLog, Autor, Metadata, TipoAutor
from sapl.decorators import receiver_multi_senders
from sapl.materia.models import Tramitacao
from sapl.parlamentares.models import Parlamentar
from sapl.protocoloadm.models import TramitacaoAdministrativo
from sapl.utils import get_base_url, models_with_gr_for_model

1
sapl/base/search_indexes.py

@ -17,7 +17,6 @@ from sapl.materia.models import DocumentoAcessorio, MateriaLegislativa
from sapl.norma.models import NormaJuridica
from sapl.sessao.models import SessaoPlenaria
from sapl.settings import SOLR_URL
from sapl.utils import RemoveTag
class TextExtractField(CharField):

2
sapl/base/tests/test_view_base.py

@ -13,7 +13,7 @@ from sapl.base.views import (anexados_ciclicos, autores_duplicados,
parlamentares_duplicados,
parlamentares_filiacoes_intersecao,
parlamentares_mandatos_intersecao,
protocolos_com_materias, protocolos_duplicados)
protocolos_com_materias)
from sapl.comissoes.models import Comissao, TipoComissao
from sapl.materia.models import (Anexada, MateriaLegislativa, RegimeTramitacao,
TipoMateriaLegislativa)

3
sapl/comissoes/tests/test_comissoes.py

@ -4,8 +4,7 @@ from django.utils.translation import gettext as _
from model_bakery import baker
from sapl.comissoes import forms
from sapl.comissoes.models import (Comissao, Composicao, Periodo, Reuniao,
TipoComissao)
from sapl.comissoes.models import (Comissao, Composicao, Periodo, TipoComissao)
from sapl.parlamentares.models import Filiacao, Parlamentar, Partido

14
sapl/comissoes/views.py

@ -2,19 +2,12 @@ import logging
from django.contrib import messages
from django.contrib.auth.mixins import PermissionRequiredMixin
from django.db.models import F
from django.http.response import HttpResponseRedirect, JsonResponse
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
from django.views.decorators.clickjacking import xframe_options_exempt
from django.views.generic import CreateView, DeleteView, FormView, ListView
from django.views.generic.base import RedirectView
from django.views.generic.detail import DetailView
from django.views.generic.edit import FormMixin, UpdateView
from django.views.generic import CreateView, ListView
from django_filters.views import FilterView
from sapl.base.models import AppConfig as AppsAppConfig
from sapl.comissoes.apps import AppConfig
from sapl.comissoes.forms import (ComissaoForm, ComposicaoForm,
DocumentoAcessorioCreateForm,
DocumentoAcessorioEditForm,
@ -22,10 +15,9 @@ from sapl.comissoes.forms import (ComissaoForm, ComposicaoForm,
PautaReuniaoFilterSet, PautaReuniaoForm,
PeriodoForm, ReuniaoForm)
from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux,
MasterDetailCrud,
PermissionRequiredForAppCrudMixin)
MasterDetailCrud)
from sapl.materia.models import (MateriaEmTramitacao, MateriaLegislativa,
PautaReuniao, Tramitacao)
PautaReuniao)
from sapl.utils import show_results_filter_set
from .models import (CargoComissao, Comissao, Composicao, DocumentoAcessorio,

1
sapl/compilacao/forms.py

@ -534,7 +534,6 @@ class PublicacaoForm(ModelForm):
)
super(PublicacaoForm, self).__init__(*args, **kwargs)
pass
class DispositivoIntegerField(forms.IntegerField):

2
sapl/compilacao/migrations/0007_auto_20180911_1600.py

@ -2,7 +2,7 @@
# Generated by Django 1.9.13 on 2018-03-21 13:54
from __future__ import unicode_literals
from django.db import migrations, models
from django.db import migrations
def insert_relacionamento_entre_dispositivos(apps, schema_editor):

3
sapl/compilacao/migrations/0012_bug_auto_inserido.py

@ -2,8 +2,7 @@
# Generated by Django 1.9.13 on 2018-03-19 13:41
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations
def adjust_bug_auto_inserido(apps, schema_editor):

2
sapl/compilacao/models.py

@ -16,7 +16,7 @@ from image_cropping.fields import ImageCropField, ImageRatioField
from sapl.compilacao.utils import (get_integrations_view_names, int_to_letter,
int_to_roman)
from sapl.utils import (YES_NO_CHOICES, get_settings_auth_user_model,
restringe_tipos_de_arquivo_img, texto_upload_path)
texto_upload_path)
class TimestampedMixin(models.Model):

3
sapl/compilacao/tests/test_tipo_texto_articulado_form.py

@ -3,8 +3,7 @@ from django.utils.translation import gettext as _
from model_bakery import baker
from sapl.compilacao import forms
from sapl.compilacao.models import PerfilEstruturalTextoArticulado, TipoNota
from sapl.compilacao.views import choice_models_in_extenal_views
from sapl.compilacao.models import TipoNota
def test_valida_campos_obrigatorios_tipo_texto_articulado_form():

7
sapl/compilacao/views.py

@ -4,7 +4,6 @@ from collections import OrderedDict
from datetime import timedelta
from braces.views import FormMessagesMixin
from bs4 import BeautifulSoup
from django import forms
from django.apps.registry import apps
from django.conf import settings
@ -15,7 +14,6 @@ from django.core.exceptions import PermissionDenied, ValidationError
from django.core.signing import Signer
from django.db import transaction
from django.db.models import Q
from django.db.models.query import QuerySet
from django.http.response import (Http404, HttpResponse, HttpResponseRedirect,
JsonResponse)
from django.shortcuts import get_object_or_404, redirect
@ -50,9 +48,7 @@ from sapl.compilacao.models import (STATUS_TA_EDITION, STATUS_TA_PRIVATE,
from sapl.compilacao.utils import (DISPOSITIVO_SELECT_RELATED,
DISPOSITIVO_SELECT_RELATED_EDIT,
get_integrations_view_names)
from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux, CrudListView,
make_pagination)
from sapl.settings import BASE_DIR
from sapl.crud.base import (RP_DETAIL, RP_LIST, CrudAux, CrudListView, make_pagination)
TipoNotaCrud = CrudAux.build(TipoNota, "tipo_nota")
TipoVideCrud = CrudAux.build(TipoVide, "tipo_vide")
@ -3773,7 +3769,6 @@ class DispositivoSearchFragmentFormView(ListView):
username = self.request.user.username
self.logger.error("user=" + username + ". " + str(e))
return []
pass
class DispositivoSearchModalView(FormView):

2
sapl/crispy_layout_mixin.py

@ -6,7 +6,7 @@ from crispy_forms.helper import FormHelper
from crispy_forms.layout import HTML, Div, Fieldset, Layout, Submit
from django import template
from django.contrib.contenttypes.models import ContentType
from django.urls import reverse, reverse_lazy
from django.urls import reverse
from django.utils import formats
from django.utils.encoding import force_str
from django.utils.translation import gettext as _

3
sapl/crud/base.py

@ -634,7 +634,6 @@ class CrudListView(PermissionRequiredContainerCrudMixin, ListView):
except Exception as e:
username = self.request.user.username
self.logger.info("user=" + username + ". " + str(e))
pass
if fm and hasattr(fm, "related_model") and fm.related_model:
rmo = fm.related_model._meta.ordering
@ -709,7 +708,6 @@ class CrudCreateView(
except Exception as e:
username = self.request.user.username
self.logger.error("user=" + username + ". " + str(e))
pass
if self.container_field:
container = self.container_field.split("__")
@ -916,7 +914,6 @@ class CrudUpdateView(
except Exception as e:
username = self.request.user.username
self.logger.error("user=" + username + ". " + str(e))
pass
return super().form_valid(form)

7
sapl/materia/forms.py

@ -40,9 +40,9 @@ from sapl.utils import (SEPARADOR_HASH_PROPOSICAO, YES_NO_CHOICES,
FilterOverridesMetaMixin, GoogleRecapthaMixin,
MateriaPesquisaOrderingFilter, autor_label,
autor_modal, choice_anos_com_materias,
gerar_hash_arquivo, get_client_ip, lista_anexados,
models_with_gr_for_model, qs_override_django_filter,
timing, validar_arquivo)
gerar_hash_arquivo, lista_anexados, models_with_gr_for_model,
qs_override_django_filter, timing,
validar_arquivo)
from .models import (AcompanhamentoMateria, Anexada, Autoria, DespachoInicial,
DocumentoAcessorio, Numeracao, Proposicao, Relatoria,
@ -2736,7 +2736,6 @@ class ConfirmarProposicaoForm(ProposicaoForm):
numeracao = BaseAppConfig.objects.last().sequencia_numeracao_protocolo
except AttributeError as e:
self.logger.error("Erro ao obter modelo. " + str(e))
pass
tipo = self.instance.tipo.tipo_conteudo_related
if tipo.sequencia_numeracao:

1
sapl/materia/migrations/0013_adiciona_status_tramitacao.py

@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations
import json
import os

2
sapl/materia/migrations/0087_update_viewdb_materiaemtramitacao.py

@ -2,7 +2,7 @@
# Generated by Django 1.11.20 on 2019-08-27 20:13
from __future__ import unicode_literals
from django.db import migrations, models
from django.db import migrations
class Migration(migrations.Migration):

1
sapl/materia/tests/test_materia.py

@ -4,7 +4,6 @@ import pytest
from django.contrib.auth import get_user_model
from django.contrib.contenttypes.models import ContentType
from django.core.files.uploadedfile import SimpleUploadedFile
from django.db.models import Max
from django.urls import reverse
from model_bakery import baker

11
sapl/materia/views.py

@ -16,20 +16,19 @@ from django.contrib.auth.decorators import permission_required
from django.contrib.auth.mixins import PermissionRequiredMixin
from django.core.exceptions import (MultipleObjectsReturned,
ObjectDoesNotExist, ValidationError)
from django.db.models import Max, Q
from django.db.models import Max
from django.http import HttpResponse, JsonResponse
from django.http.response import Http404, HttpResponseRedirect
from django.shortcuts import get_object_or_404, redirect, render
from django.template import loader
from django.urls import reverse
from django.utils import formats, timezone
from django.utils.encoding import force_str
from django.utils.translation import gettext_lazy as _
from django.views.generic import CreateView, ListView, TemplateView, UpdateView
from django.views.generic.base import RedirectView
from django.views.generic.edit import FormView
from django_filters.views import FilterView
from PyPDF4 import PdfFileMerger, PdfFileReader
from PyPDF4 import PdfFileMerger
import sapl
from sapl.base.email_utils import do_envia_email_confirmacao
@ -386,7 +385,6 @@ def recuperar_materia(request):
+ str(e)
+ " Numeracao da matéria definida como None."
)
pass
if tipo.sequencia_numeracao:
numeracao = tipo.sequencia_numeracao
@ -1044,13 +1042,10 @@ class ProposicaoCrud(Crud):
)
except ValueError as e:
self.logger.warning("User=" + username + ". " + str(e))
pass
except AttributeError as e:
self.logger.warning("User=" + username + ". " + str(e))
pass
except TypeError as e:
self.logger.warning("User=" + username + ". " + str(e))
pass
elif action == "return":
if not p.data_envio:
@ -2263,7 +2258,6 @@ class AcompanhamentoConfirmarView(TemplateView):
# (MultipleObjectsReturned) seja lançada e vá para o log,
# pois só poderá ser causada por um erro de desenvolvimente
self.logger.error("user=" + username + "." + str(e))
pass
acompanhar.confirmado = True
acompanhar.save()
@ -2308,7 +2302,6 @@ class AcompanhamentoExcluirView(TemplateView):
materia_id, hash_txt
)
)
pass
return HttpResponseRedirect(self.get_success_url())

1
sapl/norma/urls.py

@ -1,4 +1,3 @@
from django.conf import settings
from django.urls import include, path, re_path
from sapl.norma.views import (AnexoNormaJuridicaCrud, AssuntoNormaCrud,

7
sapl/norma/views.py

@ -1,11 +1,9 @@
import logging
import re
from datetime import datetime
import weasyprint
from django.contrib.auth.mixins import PermissionRequiredMixin
from django.core.exceptions import ObjectDoesNotExist
from django.db.models import Q
from django.http import HttpResponse, JsonResponse
from django.http.response import HttpResponseRedirect
from django.shortcuts import redirect
@ -20,15 +18,13 @@ from django.views.generic.edit import FormView
from django_filters.views import FilterView
import sapl
from sapl import settings
from sapl.base.models import AppConfig
from sapl.compilacao.models import STATUS_TA_PUBLIC
from sapl.compilacao.views import IntegracaoTaView
from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux,
MasterDetailCrud, make_pagination)
from sapl.materia.models import Orgao
from sapl.utils import (MultiFormatOutputMixin, get_client_ip, sapn_is_enabled,
show_results_filter_set)
from sapl.utils import (MultiFormatOutputMixin, get_client_ip, show_results_filter_set)
from .forms import (AnexoNormaJuridicaForm, AssuntoNormaFilterSet,
AutoriaNormaForm, NormaFilterSet, NormaJuridicaForm,
@ -361,7 +357,6 @@ class NormaCrud(Crud):
+ username
+ ". Erro ao obter objeto de modelo da esfera da federação."
)
pass
initial["complemento"] = False
return initial

4
sapl/painel/views.py

@ -7,7 +7,7 @@ from django.contrib.auth.decorators import user_passes_test
from django.core.exceptions import ObjectDoesNotExist
from django.db.models import Q
from django.http import HttpResponse, JsonResponse
from django.http.response import Http404, HttpResponseRedirect
from django.http.response import HttpResponseRedirect
from django.shortcuts import render
from django.urls import reverse
from django.utils import timezone
@ -17,7 +17,7 @@ from sapl.base.models import AppConfig as ConfiguracoesAplicacao
from sapl.base.models import CasaLegislativa
from sapl.crud.base import Crud
from sapl.painel.apps import AppConfig
from sapl.parlamentares.models import Legislatura, Parlamentar, Votante
from sapl.parlamentares.models import Votante
from sapl.sessao.models import (ExpedienteMateria, OradorExpediente, OrdemDia,
PresencaOrdemDia, RegistroLeitura,
RegistroVotacao, SessaoPlenaria,

1
sapl/parlamentares/migrations/0023_auto_20180626_1524.py

@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations
import json
import os

2
sapl/parlamentares/migrations/0037_atribuiMesaDiretora.py

@ -1,6 +1,6 @@
# Generated by Django 2.2.20 on 2021-07-05 13:43
from django.db import migrations, models
from django.db import migrations
def atribuiMesaDiretora(apps, schema_editor):
sl_anterior = None

1
sapl/parlamentares/models.py

@ -3,7 +3,6 @@ from django.utils import timezone
from django.utils.translation import gettext_lazy as _
from image_cropping.fields import ImageCropField, ImageRatioField
from model_utils import Choices
from prompt_toolkit.key_binding.bindings.named_commands import self_insert
from sapl.base.models import Autor
from sapl.decorators import vigencia_atual

21
sapl/parlamentares/urls.py

@ -4,23 +4,22 @@ from sapl.parlamentares.views import (BlocoCargoCrud, BlocoCrud,
BlocoMembroCrud, CargoMesaCrud,
ColigacaoCrud, ComposicaoColigacaoCrud,
DependenteCrud, FiliacaoCrud,
FrenteCargoCrud, FrenteCrud, FrenteList,
FrenteParlamentarCrud, LegislaturaCrud,
MandatoCrud, MesaDiretoraView,
NivelInstrucaoCrud, ParlamentarCrud,
ParlamentarMateriasView,
FrenteCargoCrud, FrenteCrud, FrenteParlamentarCrud,
LegislaturaCrud, MandatoCrud,
MesaDiretoraView, NivelInstrucaoCrud,
ParlamentarCrud, ParlamentarMateriasView,
ParlamentarNormasView,
ParticipacaoParlamentarCrud, PartidoCrud,
PesquisarColigacaoView,
ParticipacaoParlamentarCrud,
PartidoCrud, PesquisarColigacaoView,
PesquisarParlamentarView,
PesquisarPartidoView,
ProposicaoParlamentarCrud,
RelatoriaParlamentarCrud,
SessaoLegislativaCrud,
TipoAfastamentoCrud, TipoDependenteCrud,
TipoMilitarCrud, VincularParlamentarView,
VotanteView, altera_field_mesa,
altera_field_mesa_public_view,
TipoAfastamentoCrud,
TipoDependenteCrud, TipoMilitarCrud,
VincularParlamentarView, VotanteView,
altera_field_mesa, altera_field_mesa_public_view,
coligacao_legislatura,
frente_atualiza_lista_parlamentares,
get_parlamentar_frentes,

5
sapl/parlamentares/views.py

@ -7,12 +7,11 @@ from django.contrib.auth.mixins import PermissionRequiredMixin
from django.contrib.auth.models import Group
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
from django.db.models import F, Q
from django.db.models import Q
from django.db.models.aggregates import Count
from django.http import JsonResponse
from django.http.response import HttpResponseRedirect
from django.shortcuts import render
from django.templatetags.static import static
from django.urls import reverse, reverse_lazy
from django.utils import timezone
from django.utils.datastructures import MultiValueDictKeyError
@ -30,7 +29,7 @@ from sapl.crud.base import (RP_CHANGE, RP_DETAIL, RP_LIST, Crud, CrudAux,
CrudBaseForListAndDetailExternalAppView,
MasterDetailCrud, make_pagination)
from sapl.materia.models import Autoria, Proposicao, Relatoria
from sapl.norma.models import AutoriaNorma, NormaJuridica
from sapl.norma.models import AutoriaNorma
from sapl.parlamentares.apps import AppConfig
from sapl.rules import SAPL_GROUP_VOTANTE
from sapl.utils import parlamentares_ativos, show_results_filter_set

9
sapl/protocoloadm/views.py

@ -1,14 +1,12 @@
import logging
import os
import re
import time
from datetime import datetime
from io import BytesIO
from random import choice
from string import ascii_letters, digits
from braces.views import FormValidMessageMixin
from django.conf import settings
from django.contrib import messages
from django.contrib.admin.views.decorators import staff_member_required
from django.contrib.auth.decorators import permission_required
@ -29,7 +27,6 @@ from django.views.generic.edit import FormView
from django_filters.views import FilterView
from PyPDF4 import PdfFileMerger
import sapl
from sapl.base.email_utils import do_envia_email_confirmacao
from sapl.base.models import AppConfig, Autor, CasaLegislativa
from sapl.comissoes.models import Comissao
@ -46,9 +43,9 @@ from sapl.protocoloadm.models import (DocumentoAdministrativo, Protocolo,
from sapl.relatorios.views import relatorio_doc_administrativos
from sapl.utils import (MultiFormatOutputMixin, create_barcode,
from_date_to_datetime_utc, get_base_url, get_client_ip,
get_mime_type_from_file_extension, get_tempfile_dir,
google_recaptcha_configured, lista_anexados,
mail_service_configured, show_results_filter_set)
get_mime_type_from_file_extension, google_recaptcha_configured,
lista_anexados, mail_service_configured,
show_results_filter_set)
from ..settings import MEDIA_ROOT
from .forms import (AcompanhamentoDocumentoForm, AnexadoEmLoteFilterSet,

1
sapl/relatorios/templates/pdf_capa_processo_preparar_pysc.py

@ -1,4 +1,3 @@
import os
request = context.REQUEST
response = request.RESPONSE

1
sapl/relatorios/templates/pdf_detalhe_materia_preparar_pysc.py

@ -1,4 +1,3 @@
import os
request = context.REQUEST
response = request.RESPONSE

1
sapl/relatorios/templates/pdf_documento_administrativo_preparar_pysc.py

@ -1,4 +1,3 @@
import os
request = context.REQUEST
response = request.RESPONSE

1
sapl/relatorios/templates/pdf_espelho_preparar_pysc.py

@ -1,4 +1,3 @@
import os
request = context.REQUEST
response = request.RESPONSE

1
sapl/relatorios/templates/pdf_etiqueta_protocolo_preparar_pysc.py

@ -1,4 +1,3 @@
import os
request = context.REQUEST
response = request.RESPONSE

1
sapl/relatorios/templates/pdf_materia_preparar_pysc.py

@ -1,4 +1,3 @@
import os
request = context.REQUEST
# print request

1
sapl/relatorios/templates/pdf_norma_preparar_pysc.py

@ -1,4 +1,3 @@
import os
request = context.REQUEST
response = request.RESPONSE

1
sapl/relatorios/templates/pdf_ordem_dia_preparar_pysc.py

@ -1,4 +1,3 @@
import os
request = context.REQUEST
response = request.RESPONSE

1
sapl/relatorios/templates/pdf_pauta_sessao_preparar_pysc.py

@ -1,4 +1,3 @@
import os
request = context.REQUEST
response = request.RESPONSE

1
sapl/relatorios/templates/pdf_protocolo_preparar_pysc.py

@ -1,4 +1,3 @@
import os
request = context.REQUEST
response = request.RESPONSE

2
sapl/relatorios/templates/pdf_sessao_plenaria_gerar.py

@ -8,8 +8,6 @@ import logging
import os
import time
from django.template.defaultfilters import safe
from django.utils.html import strip_tags
from trml2pdf import parseString
from sapl.sessao.models import ResumoOrdenacao

1
sapl/relatorios/templates/pdf_sessao_plenaria_preparar_pysc.py

@ -1,4 +1,3 @@
import os
request = context.REQUEST
response = request.RESPONSE

1
sapl/rules/management/commands/check_ids_sequences.py

@ -3,7 +3,6 @@ import logging
from django.apps import apps
from django.core.management.base import BaseCommand
from django.db import connection
from django.db.utils import DEFAULT_DB_ALIAS
logger = logging.getLogger(__name__)

11
sapl/sessao/forms.py

@ -24,18 +24,17 @@ from sapl.parlamentares.models import Mandato, Parlamentar
from sapl.protocoloadm.models import (DocumentoAdministrativo,
TipoDocumentoAdministrativo)
from sapl.sessao.models import Correspondencia
from sapl.utils import (RANGE_DIAS_MES, RANGE_MESES, TIME_PATTERN,
FileFieldCheckMixin, FilterOverridesMetaMixin,
MateriaPesquisaOrderingFilter, autor_label,
autor_modal, choice_anos_com_sessaoplenaria, timezone,
validar_arquivo)
from sapl.utils import (RANGE_DIAS_MES, RANGE_MESES, FileFieldCheckMixin,
FilterOverridesMetaMixin, MateriaPesquisaOrderingFilter,
autor_label, autor_modal,
choice_anos_com_sessaoplenaria, timezone, validar_arquivo)
from .models import (ORDENACAO_RESUMO, Bancada, ExpedienteMateria,
JustificativaAusencia, OcorrenciaSessao, Orador,
OradorExpediente, OradorOrdemDia, OrdemDia,
PresencaOrdemDia, RegistroLeitura, ResumoOrdenacao,
RetiradaPauta, SessaoPlenaria, SessaoPlenariaPresenca,
TipoResultadoVotacao, TipoRetiradaPauta, Tramitacao)
TipoResultadoVotacao, TipoRetiradaPauta)
MES_CHOICES = RANGE_MESES
DIA_CHOICES = RANGE_DIAS_MES

1
sapl/sessao/migrations/0005_auto_20170601_1246.py

@ -5,7 +5,6 @@ from __future__ import unicode_literals
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
from datetime import datetime
class Migration(migrations.Migration):

2
sapl/sessao/serializers.py

@ -1,3 +1 @@
from rest_framework import serializers
from .models import SessaoPlenaria

18
sapl/sessao/tests/test_sessao_view.py

@ -5,19 +5,15 @@ from model_bakery import baker
from sapl.parlamentares.models import (CargoMesa, Filiacao, Legislatura,
Parlamentar, SessaoLegislativa)
from sapl.sessao.models import (ExpedienteMateria, ExpedienteSessao,
IntegranteMesa, JustificativaAusencia,
OcorrenciaSessao, Orador, SessaoPlenaria,
SessaoPlenariaPresenca, TipoExpediente,
TipoSessaoPlenaria)
from sapl.sessao.models import (ExpedienteSessao, IntegranteMesa,
JustificativaAusencia, OcorrenciaSessao,
Orador, SessaoPlenaria, SessaoPlenariaPresenca,
TipoExpediente, TipoSessaoPlenaria)
from sapl.sessao.views import (get_conteudo_multimidia, get_expedientes,
get_identificacao_basica,
get_materias_expediente,
get_materias_ordem_do_dia, get_mesa_diretora,
get_ocorrencias_da_sessao,
get_oradores_expediente,
get_oradores_explicacoes_pessoais,
get_presenca_ordem_do_dia, get_presenca_sessao)
get_mesa_diretora,
get_ocorrencias_da_sessao, get_oradores_explicacoes_pessoais,
get_presenca_sessao)
@pytest.mark.django_db(transaction=False)

12
sapl/sessao/views.py

@ -1,10 +1,7 @@
import json
import logging
from collections import OrderedDict
from datetime import datetime
from re import sub
from django.conf import settings
from django.contrib import messages
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.mixins import PermissionRequiredMixin
@ -13,7 +10,6 @@ from django.db.models import Max, Q
from django.http import JsonResponse
from django.http.response import Http404, HttpResponseRedirect
from django.urls import reverse
from django.urls.base import reverse_lazy
from django.utils import timezone
from django.utils.datastructures import MultiValueDictKeyError
from django.utils.decorators import method_decorator
@ -32,19 +28,17 @@ from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux,
MasterDetailCrud,
PermissionRequiredForAppCrudMixin, make_pagination)
from sapl.materia.forms import filtra_tramitacao_status
from sapl.materia.models import (Autoria, MateriaEmTramitacao, Numeracao,
TipoMateriaLegislativa, Tramitacao)
from sapl.materia.models import (Autoria, MateriaEmTramitacao, TipoMateriaLegislativa,
Tramitacao)
from sapl.materia.views import MateriaLegislativaPesquisaView
from sapl.parlamentares.models import (Filiacao, Legislatura, Mandato,
Parlamentar, SessaoLegislativa)
from sapl.protocoloadm.models import (DocumentoAdministrativo,
TipoDocumentoAdministrativo)
from sapl.protocoloadm.models import DocumentoAdministrativo
from sapl.sessao.apps import AppConfig
from sapl.sessao.forms import (CorrespondenciaEmLoteFilterSet,
CorrespondenciaForm, ExpedienteMateriaForm,
OrdemDiaForm, OrdemExpedienteLeituraForm)
from sapl.sessao.models import Correspondencia
from sapl.settings import TIME_ZONE
from sapl.utils import (MultiFormatOutputMixin, PautaMultiFormatOutputMixin,
get_client_ip, remover_acentos,
show_results_filter_set)

1
sapl/settings.py

@ -15,7 +15,6 @@ See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
"""
import logging
import socket
import sys
from decouple import config
from dj_database_url import parse as db_url

1
sapl/test_urls.py

@ -464,7 +464,6 @@ def test_permissions_urls_for_users_by_apps(url_item, client):
urls_publicas_excecoes, logo acima do teste
"""
pass
if isinstance(app_labels, str):
app_labels = (app_labels,)

4
sapl/utils.py

@ -6,11 +6,10 @@ import os
import platform
import re
import string
import sys
import tempfile
import unicodedata
from functools import wraps
from itertools import chain, groupby
from itertools import groupby
from operator import itemgetter
from time import time
from unicodedata import normalize as unicodedata_normalize
@ -36,7 +35,6 @@ from django.core.files.uploadedfile import (InMemoryUploadedFile,
from django.core.mail import get_connection
from django.db import models
from django.db.models import Q
from django.db.models.fields.related import ForeignKey
from django.forms import BaseForm
from django.forms.widgets import ClearableFileInput, SplitDateTimeWidget
from django.http.response import HttpResponse, JsonResponse

Loading…
Cancel
Save