SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Remove notação u'string' para codificação de strings não necessária nas versões python 3.x (#1237) 

Signed-off-by: Eliseu Egewarth <eliseuegewarth@gmail.com>
pull/1242/head
Eliseu Egewarth 8 years ago
committed by Edward
parent
a18fe7b0d2
commit
2c758aca50
8 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      sapl/base/forms.py
  2. 2
      sapl/legacy/management/commands/migracao_25_31.py
  3. 2
      sapl/legacy/management/commands/migracao_documentos.py
  4. 6
      sapl/materia/forms.py
  5. 2
      sapl/norma/forms.py
  6. 6
      sapl/protocoloadm/forms.py
  7. 10
      sapl/sessao/forms.py
  8. 2
      sapl/settings.py

4
sapl/base/forms.py
View File

@ -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:

2
sapl/legacy/management/commands/migracao_25_31.py
View File

@ -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(

2
sapl/legacy/management/commands/migracao_documentos.py
View File

@ -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()

6
sapl/materia/forms.py
View File

@ -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(

2
sapl/norma/forms.py
View File

@ -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')

6
sapl/protocoloadm/forms.py
View File

@ -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')

10
sapl/sessao/forms.py
View File

@ -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):

2
sapl/settings.py
View File

@ -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'

Write Preview
Loading…
Cancel
Save