Skip to content

Commit

Permalink
Corrige erros de PEP 8 com autopep8
Browse files Browse the repository at this point in the history
Correções feitas usando o scrip fix_qa.sh na raiz do projeto
que agora contém a linha

autopep8 --in-place --recursive . --exclude='migrations,ipython_log.py*'
  • Loading branch information
marciomazza committed Aug 17, 2017
1 parent 35df101 commit 0677a85
Show file tree
Hide file tree
Showing 43 changed files with 2,306 additions and 1,968 deletions.
10 changes: 7 additions & 3 deletions create_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,28 @@

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "sapl.settings")


def create_superuser():
from django.contrib.auth.models import User

username = "admin"
password = os.environ['ADMIN_PASSWORD'] if 'ADMIN_PASSWORD' in os.environ else None
password = os.environ[
'ADMIN_PASSWORD'] if 'ADMIN_PASSWORD' in os.environ else None
email = os.environ['ADMIN_EMAIL'] if 'ADMIN_EMAIL' in os.environ else ''

if User.objects.filter(username=username).exists():
print("[SUPERUSER] User %s already exists. Exiting without change." % username)
sys.exit('ADMIN_USER_EXISTS')
else:
if not password:
print("[SUPERUSER] Environment variable $ADMIN_PASSWORD for user %s was not set. Leaving..." % username)
print(
"[SUPERUSER] Environment variable $ADMIN_PASSWORD for user %s was not set. Leaving..." % username)
sys.exit('MISSING_ADMIN_PASSWORD')

print("[SUPERUSER] Creating superuser...")

u = User.objects.create_superuser(username=username, password=password, email=email)
u = User.objects.create_superuser(
username=username, password=password, email=email)
u.save()

print("[SUPERUSER] Done.")
Expand Down
23 changes: 14 additions & 9 deletions sapl/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,18 @@ class SessaoPlenariaSerializer(serializers.ModelSerializer):
txtSiglaOrgao = serializers.SerializerMethodField('get_sigla_orgao')
txtApelido = serializers.SerializerMethodField('get_name')
txtNomeOrgao = serializers.SerializerMethodField('get_nome_orgao')
codEstadoReuniao = serializers.SerializerMethodField('get_estadoSessaoPlenaria')
codEstadoReuniao = serializers.SerializerMethodField(
'get_estadoSessaoPlenaria')
txtTipoReuniao = serializers.SerializerMethodField('get_tipo_sessao')
txtObjeto = serializers.SerializerMethodField('get_assunto_sessao')
txtLocal = serializers.SerializerMethodField('get_endereco_orgao')
bolReuniaoConjunta = serializers.SerializerMethodField('get_reuniao_conjunta')
bolHabilitarEventoInterativo = serializers.SerializerMethodField('get_iterativo')
bolReuniaoConjunta = serializers.SerializerMethodField(
'get_reuniao_conjunta')
bolHabilitarEventoInterativo = serializers.SerializerMethodField(
'get_iterativo')
idYoutube = serializers.SerializerMethodField('get_url')
codEstadoTransmissaoYoutube = serializers.SerializerMethodField('get_estadoTransmissaoYoutube')
codEstadoTransmissaoYoutube = serializers.SerializerMethodField(
'get_estadoTransmissaoYoutube')
datReuniaoString = serializers.SerializerMethodField('get_date')

# Constantes SessaoPlenaria (de 1-9) (apenas 3 serão usados)
Expand All @@ -80,9 +84,9 @@ class SessaoPlenariaSerializer(serializers.ModelSerializer):
SESSAO_CONVOCADA = 2

# Constantes EstadoTranmissaoYoutube (de 0 a 2)
TRANSMISSAO_ENCERRADA = 2
TRANSMISSAO_EM_ANDAMENTO = 1
SEM_TRANSMISSAO = 0
TRANSMISSAO_ENCERRADA = 2
TRANSMISSAO_EM_ANDAMENTO = 1
SEM_TRANSMISSAO = 0

class Meta:
model = SessaoPlenaria
Expand All @@ -102,7 +106,7 @@ class Meta:
'idYoutube',
'codEstadoTransmissaoYoutube',
'datReuniaoString'
)
)

def __init__(self, *args, **kwargs):
super(SessaoPlenariaSerializer, self).__init__(args, kwargs)
Expand Down Expand Up @@ -136,7 +140,7 @@ def get_date(self, obj):
obj.data_inicio.strftime("%d/%m/%Y"),
obj.hora_inicio,
":00"
)
)

def get_estadoTransmissaoYoutube(self, obj):
if obj.url_video:
Expand All @@ -146,6 +150,7 @@ def get_estadoTransmissaoYoutube(self, obj):
return self.TRANSMISSAO_EM_ANDAMENTO
else:
return self.SEM_TRANSMISSAO

def get_assunto_sessao(self, obj):
pauta_sessao = ''
ordem_dia = OrdemDia.objects.filter(sessao_plenaria=obj.pk)
Expand Down
2 changes: 1 addition & 1 deletion sapl/base/search_indexes.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@ class NormaJuridicaIndex(DocumentoAcessorioIndex):
template_name = 'norma/normajuridica_text.txt'

def get_updated_field(self):
return 'data_ultima_atualizacao'
return 'data_ultima_atualizacao'
2 changes: 2 additions & 0 deletions sapl/base/templatetags/common_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ def str2intabs(value):
except:
return ''


@register.filter
def has_iframe(request):

Expand Down Expand Up @@ -181,6 +182,7 @@ def urldetail(obj):
return '%s:%s_detail' % (
obj._meta.app_config.name, obj._meta.model_name)


@register.filter
def filiacao_data_filter(parlamentar, data_inicio):
return filiacao_data(parlamentar, data_inicio)
Expand Down
6 changes: 3 additions & 3 deletions sapl/base/tests/teststub_urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from sapl.urls import urlpatterns as original_patterns

urlpatterns = original_patterns + patterns('', url(r'^zzzz$',
TemplateView.as_view(
template_name='index.html'),
name='zzzz')
TemplateView.as_view(
template_name='index.html'),
name='zzzz')
)
8 changes: 5 additions & 3 deletions sapl/comissoes/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def get_context_data(self, **kwargs):

context['participacao_set'] = Participacao.objects.filter(
composicao__pk=context['composicao_pk']
).order_by('parlamentar')
).order_by('parlamentar')
return context


Expand All @@ -82,21 +82,23 @@ class ComissaoCrud(Crud):
public = [RP_LIST, RP_DETAIL, ]

class BaseMixin(Crud.BaseMixin):
list_field_names = ['nome', 'sigla', 'tipo', 'data_criacao', 'data_extincao', 'ativa']
list_field_names = ['nome', 'sigla', 'tipo',
'data_criacao', 'data_extincao', 'ativa']
ordering = '-ativa', 'sigla'

class ListView(Crud.ListView):

@xframe_options_exempt
def get(self, request, *args, **kwargs):
return super().get(request, *args, **kwargs)

class DetailView(Crud.DetailView):

@xframe_options_exempt
def get(self, request, *args, **kwargs):
return super().get(request, *args, **kwargs)



class MateriasTramitacaoListView(ListView):
template_name = "comissoes/materias_em_tramitacao.html"
paginate_by = 10
Expand Down
1 change: 0 additions & 1 deletion sapl/compilacao/templatetags/compilacao_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ def nomenclatura_heranca(d, ignore_ultimo=0, ignore_primeiro=0):
return result



@register.filter
def list(obj):
return [obj, ]
Expand Down
2 changes: 1 addition & 1 deletion sapl/legacy/management/commands/migracao_25_31.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class Command(BaseCommand):

help ='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(
Expand Down
2 changes: 1 addition & 1 deletion sapl/legacy/management/commands/migracao_documentos.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class Command(BaseCommand):

help ='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()
2 changes: 1 addition & 1 deletion sapl/legacy/migracao_documentos.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def migrar_documentos():
SessaoPlenaria,
Proposicao,
DocumentoAdministrativo,
DocumentoAcessorioAdministrativo,
DocumentoAcessorioAdministrativo,
]:
migrar_docs_por_ids(tipo)

Expand Down
19 changes: 9 additions & 10 deletions sapl/legacy/migration.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def get_fk_related(field, value, label=None):
value = TipoProposicao.objects.create(
id=value, descricao='Erro', content_type=ct)
ultimo_valor = get_last_value(type(value))
alter_sequence(type(value), ultimo_valor+1)
alter_sequence(type(value), ultimo_valor + 1)
else:
value = tipo[0]
else:
Expand Down Expand Up @@ -252,7 +252,7 @@ def problema_duplicatas(model, lista_duplicatas, argumentos):
string_pks = ""
problema = "%s de PK %s não é único." % (model.__name__, obj.pk)
args_dict = {k: obj.__dict__[k]
for k in set(argumentos) & set(obj.__dict__.keys())}
for k in set(argumentos) & set(obj.__dict__.keys())}
for dup in model.objects.filter(**args_dict):
pks.append(dup.pk)
string_pks = "(" + ", ".join(map(str, pks)) + ")"
Expand Down Expand Up @@ -407,7 +407,7 @@ def fill_vinculo_norma_juridica():
'Julgada parcialmente inconstitucional')]
lista_objs = [TipoVinculoNormaJuridica(
sigla=item[0], descricao_ativa=item[1], descricao_passiva=item[2])
for item in lista]
for item in lista]
TipoVinculoNormaJuridica.objects.bulk_create(lista_objs)


Expand Down Expand Up @@ -610,7 +610,7 @@ def save(new, old):

# necessário para ajustar sequence da tabela para o ultimo valor de id
ultimo_valor = get_last_value(model)
alter_sequence(model, ultimo_valor+1)
alter_sequence(model, ultimo_valor + 1)

def delete_ind_excluido(self):
excluidos = 0
Expand Down Expand Up @@ -665,15 +665,15 @@ def adjust_documentoadministrativo(new, old):
except Exception:
try:
protocolo = Protocolo.objects.get(numero=new.numero_protocolo,
ano=new.ano+1)
ano=new.ano + 1)
new.protocolo = protocolo
except Exception:
protocolo = mommy.make(Protocolo, numero=new.numero_protocolo,
ano=new.ano)
with reversion.create_revision():
problema = 'Protocolo Vinculado [numero_protocolo=%s, '\
'ano=%s] não existe' % (new.numero_protocolo,
new.ano)
'ano=%s] não existe' % (new.numero_protocolo,
new.ano)
descricao = 'O protocolo inexistente foi criado'
warn(problema + ' => ' + descricao)
save_relation(obj=protocolo, problema=problema,
Expand Down Expand Up @@ -751,7 +751,7 @@ def adjust_proposicao_antes_salvar(new, old):
def adjust_proposicao_depois_salvar(new, old):
if not hasattr(old.dat_envio, 'year') or old.dat_envio.year == 1800:
msg = "O valor do campo data_envio (DateField) da model Proposicao"\
" era inválido"
" era inválido"
descricao = 'A data 1111-11-11 foi colocada no lugar'
problema = 'O valor da data era nulo ou inválido'
warn(msg + ' => ' + descricao)
Expand Down Expand Up @@ -816,7 +816,6 @@ def adjust_tipoafastamento(new, old):
new.indicador = 'A'



def adjust_tipoproposicao(new, old):
if old.ind_mat_ou_doc == 'M':
new.tipo_conteudo_related = TipoMateriaLegislativa.objects.get(
Expand Down Expand Up @@ -870,7 +869,7 @@ def adjust_autor(new, old):
except Exception:
with reversion.create_revision():
msg = 'Um parlamentar relacionado de PK [%s] não existia' \
% old.cod_parlamentar
% old.cod_parlamentar
reversion.set_comment('Stub criado pela migração')
value = make_stub(Parlamentar, old.cod_parlamentar)
descricao = 'stub criado para entrada orfã!'
Expand Down
11 changes: 7 additions & 4 deletions sapl/legacy/scripts/street_sweeper.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
NORMA_DEP = "DELETE FROM vinculo_norma_juridica WHERE cod_norma_referente in (%s) OR \
cod_norma_referida in (%s) AND ind_excluido = 0 "

mapa = {} # mapa com tabela principal -> tabelas dependentes
mapa = {} # mapa com tabela principal -> tabelas dependentes

mapa['tipo_autor'] = ['autor']
mapa['materia_legislativa'] = ['acomp_materia', 'autoria', 'despacho_inicial',
Expand All @@ -43,6 +43,7 @@
'sessao_plenaria_presenca', 'unidade_tramitacao']
"""


def get_ids_excluidos(cursor, query):
"""
recupera as PKs de registros com ind_excluido = 1 da tabela principal
Expand All @@ -58,7 +59,8 @@ def remove_tabelas(cursor, tabela_principal, pk, query_dependentes=None):

QUERY = SELECT_EXCLUIDOS % (pk, tabela_principal, pk)
ids_excluidos = get_ids_excluidos(cursor, QUERY)
print("\nRegistros da tabela '%s' com ind_excluido = 1: %s" % (tabela_principal.upper(), len(ids_excluidos)))
print("\nRegistros da tabela '%s' com ind_excluido = 1: %s" %
(tabela_principal.upper(), len(ids_excluidos)))

"""
Remove registros de tabelas que dependem da tabela principal,
Expand All @@ -69,12 +71,13 @@ def remove_tabelas(cursor, tabela_principal, pk, query_dependentes=None):
print("Dependencias inconsistentes")
for tabela in mapa[tabela_principal]:

QUERY_DEP = REGISTROS_INCONSISTENTES % (tabela, pk, ','.join(ids_excluidos))
QUERY_DEP = REGISTROS_INCONSISTENTES % (
tabela, pk, ','.join(ids_excluidos))

# Trata caso especifico de norma_juridica
if query_dependentes:
QUERY_DEP = query_dependentes % (','.join(ids_excluidos),
','.join(ids_excluidos))
','.join(ids_excluidos))

print(tabela.upper(), cursor.execute(QUERY_DEP))

Expand Down
1 change: 1 addition & 0 deletions sapl/materia/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
admin.site.unregister(Proposicao)

class ProposicaoAdmin(admin.ModelAdmin):

def has_add_permission(self, request, obj=None):
return False

Expand Down
3 changes: 2 additions & 1 deletion sapl/materia/email_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ def do_envia_email_tramitacao(base_url, materia, status, unidade_destino):
# a conexão será fechada
except Exception:
connection.close()
raise Exception('Erro ao enviar e-mail de acompanhamento de matéria.')
raise Exception(
'Erro ao enviar e-mail de acompanhamento de matéria.')

connection.close()
10 changes: 5 additions & 5 deletions sapl/materia/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1060,11 +1060,11 @@ class CreateView(MasterDetailCrud.CreateView):

def __init__(self, **kwargs):
super(MasterDetailCrud.CreateView, self).__init__(**kwargs)

def get_initial(self):
self.initial['data'] = datetime.now().date()

return self.initial
return self.initial

def get_context_data(self, **kwargs):
context = super(
Expand Down Expand Up @@ -1735,9 +1735,9 @@ def get_context_data(self, **kwargs):

if ('tramitacao__status' in qr and
'tramitacao__unidade_tramitacao_destino' in qr and
qr['tramitacao__status'] and
qr['tramitacao__unidade_tramitacao_destino']
):
qr['tramitacao__status'] and
qr['tramitacao__unidade_tramitacao_destino']
):
lista = filtra_tramitacao_destino_and_status(
qr['tramitacao__status'],
qr['tramitacao__unidade_tramitacao_destino'])
Expand Down
8 changes: 5 additions & 3 deletions sapl/norma/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@ class Meta:
def __str__(self):
return self.descricao


def norma_upload_path(instance, filename):
return texto_upload_path(instance, filename, subpath=instance.ano)
return texto_upload_path(instance, filename, subpath=instance.ano)


@reversion.register()
class NormaJuridica(models.Model):
Expand Down Expand Up @@ -133,9 +135,9 @@ class Meta:

def get_normas_relacionadas(self):
principais = NormaRelacionada.objects.filter(
norma_principal=self.id)
norma_principal=self.id)
relacionadas = NormaRelacionada.objects.filter(
norma_relacionada=self.id)
norma_relacionada=self.id)
return (principais, relacionadas)

def __str__(self):
Expand Down
Loading

0 comments on commit 0677a85

Please sign in to comment.