From 2c758aca50fb6e39ee163410be2daded656c0a10 Mon Sep 17 00:00:00 2001 From: Eliseu Egewarth Date: Fri, 30 Jun 2017 08:31:48 -0300 Subject: [PATCH] =?UTF-8?q?Remove=20nota=C3=A7=C3=A3o=20u'string'=20para?= =?UTF-8?q?=20codifica=C3=A7=C3=A3o=20de=20strings=20n=C3=A3o=20necess?= =?UTF-8?q?=C3=A1ria=20nas=20vers=C3=B5es=20python=203.x=20(#1237)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eliseu Egewarth --- sapl/base/forms.py | 4 ++-- sapl/legacy/management/commands/migracao_25_31.py | 2 +- sapl/legacy/management/commands/migracao_documentos.py | 2 +- sapl/materia/forms.py | 6 +++--- sapl/norma/forms.py | 2 +- sapl/protocoloadm/forms.py | 6 +++--- sapl/sessao/forms.py | 10 +++++----- sapl/settings.py | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sapl/base/forms.py b/sapl/base/forms.py index dcc453d5d..b245470a1 100644 --- a/sapl/base/forms.py +++ b/sapl/base/forms.py @@ -541,7 +541,7 @@ class RelatorioHistoricoTramitacaoFilterSet(django_filters.FilterSet): class RelatorioMateriasTramitacaoilterSet(django_filters.FilterSet): ano = django_filters.ChoiceFilter(required=True, - label=u'Ano da Matéria', + label='Ano da Matéria', choices=RANGE_ANOS) class Meta: @@ -572,7 +572,7 @@ class RelatorioMateriasTramitacaoilterSet(django_filters.FilterSet): class RelatorioMateriasPorAnoAutorTipoFilterSet(django_filters.FilterSet): ano = django_filters.ChoiceFilter(required=True, - label=u'Ano da Matéria', + label='Ano da Matéria', choices=RANGE_ANOS) class Meta: diff --git a/sapl/legacy/management/commands/migracao_25_31.py b/sapl/legacy/management/commands/migracao_25_31.py index 5334ac7c0..7e8671e38 100644 --- a/sapl/legacy/management/commands/migracao_25_31.py +++ b/sapl/legacy/management/commands/migracao_25_31.py @@ -5,7 +5,7 @@ from sapl.legacy import migration class Command(BaseCommand): - help = u'Migração de dados do SAPL 2.5 para o SAPL 3.1' + help ='Migração de dados do SAPL 2.5 para o SAPL 3.1' def add_arguments(self, parser): parser.add_argument( diff --git a/sapl/legacy/management/commands/migracao_documentos.py b/sapl/legacy/management/commands/migracao_documentos.py index c096e2905..0af503b39 100644 --- a/sapl/legacy/management/commands/migracao_documentos.py +++ b/sapl/legacy/management/commands/migracao_documentos.py @@ -5,7 +5,7 @@ from sapl.legacy.migracao_documentos import migrar_documentos class Command(BaseCommand): - help = u'Migração documentos do SAPL 2.5 para o SAPL 3.1' + help ='Migração documentos do SAPL 2.5 para o SAPL 3.1' def handle(self, *args, **options): migrar_documentos() diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 311e85b8e..123f8084c 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -485,19 +485,19 @@ class MateriaLegislativaFilterSet(django_filters.FilterSet): }} ano = django_filters.ChoiceFilter(required=False, - label=u'Ano da Matéria', + label='Ano da Matéria', choices=ANO_CHOICES) autoria__autor = django_filters.CharFilter(widget=forms.HiddenInput()) autoria__primeiro_autor = django_filters.BooleanFilter(required=False, - label=u'Primeiro Autor', + label='Primeiro Autor', widget=forms.HiddenInput()) ementa = django_filters.CharFilter(lookup_expr='icontains') em_tramitacao = django_filters.ChoiceFilter(required=False, - label=u'Em tramitação', + label='Em tramitação', choices=em_tramitacao) materiaassunto__assunto = django_filters.ModelChoiceFilter( diff --git a/sapl/norma/forms.py b/sapl/norma/forms.py index 2eea5d939..ffdd09481 100644 --- a/sapl/norma/forms.py +++ b/sapl/norma/forms.py @@ -47,7 +47,7 @@ class NormaFilterSet(django_filters.FilterSet): }} ano = django_filters.ChoiceFilter(required=False, - label=u'Ano', + label='Ano', choices=ANO_CHOICES) ementa = django_filters.CharFilter(lookup_expr='icontains') diff --git a/sapl/protocoloadm/forms.py b/sapl/protocoloadm/forms.py index 8b5ba27df..e513d4b1b 100644 --- a/sapl/protocoloadm/forms.py +++ b/sapl/protocoloadm/forms.py @@ -47,7 +47,7 @@ class ProtocoloFilterSet(django_filters.FilterSet): }} ano = django_filters.ChoiceFilter(required=False, - label=u'Ano', + label='Ano', choices=ANO_CHOICES) assunto_ementa = django_filters.CharFilter(lookup_expr='icontains') @@ -135,11 +135,11 @@ class DocumentoAdministrativoFilterSet(django_filters.FilterSet): }} ano = django_filters.ChoiceFilter(required=False, - label=u'Ano', + label='Ano', choices=ANO_CHOICES) tramitacao = django_filters.ChoiceFilter(required=False, - label=u'Em Tramitação?', + label='Em Tramitação?', choices=EM_TRAMITACAO) assunto = django_filters.CharFilter(lookup_expr='icontains') diff --git a/sapl/sessao/forms.py b/sapl/sessao/forms.py index 58f526436..6ec401ebf 100644 --- a/sapl/sessao/forms.py +++ b/sapl/sessao/forms.py @@ -240,13 +240,13 @@ class VotacaoEditForm(forms.Form): class SessaoPlenariaFilterSet(django_filters.FilterSet): data_inicio__year = django_filters.ChoiceFilter(required=False, - label=u'Ano', + label='Ano', choices=ANO_CHOICES) data_inicio__month = django_filters.ChoiceFilter(required=False, - label=u'Mês', + label='Mês', choices=MES_CHOICES) data_inicio__day = django_filters.ChoiceFilter(required=False, - label=u'Dia', + label='Dia', choices=DIA_CHOICES) titulo = _('Pesquisa de Sessão Plenária') @@ -382,7 +382,7 @@ class ResumoOrdenacaoForm(forms.Form): choices=ORDENACAO_RESUMO) segundo = forms.ChoiceField(label=_('2°'), choices=ORDENACAO_RESUMO) - terceiro = forms.ChoiceField(label=u'3°', + terceiro = forms.ChoiceField(label='3°', choices=ORDENACAO_RESUMO) quarto = forms.ChoiceField(label=_('4°'), choices=ORDENACAO_RESUMO) @@ -396,7 +396,7 @@ class ResumoOrdenacaoForm(forms.Form): choices=ORDENACAO_RESUMO) nono = forms.ChoiceField(label=_('9°'), choices=ORDENACAO_RESUMO) - decimo = forms.ChoiceField(label=u'10°', + decimo = forms.ChoiceField(label='10°', choices=ORDENACAO_RESUMO) def __init__(self, *args, **kwargs): diff --git a/sapl/settings.py b/sapl/settings.py index b9eb805a2..8769115bc 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -199,7 +199,7 @@ MAX_IMAGE_UPLOAD_SIZE = 2 * 1024 * 1024 # 2MB # https://docs.djangoproject.com/en/1.8/topics/i18n/ LANGUAGE_CODE = 'pt-br' LANGUAGES = ( - ('pt-br', u'Português'), + ('pt-br','Português'), ) TIME_ZONE = 'America/Sao_Paulo'