Merge branch 'master' of github.com:interlegis/sapl

Conflicts:
	sessao/views.py

legacy/migration.py

@@ -11,8 +11,8 @@ from model_mommy import mommy
 
 from comissoes.models import Composicao, Participacao
 from parlamentares.models import Parlamentar
-from sessao.models import SessaoPlenaria
 from sapl.utils import appconfs
+from sessao.models import SessaoPlenaria
 
 # BASE ######################################################################
 

painel/views.py

@@ -3,7 +3,7 @@ from django.core import serializers
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import render
 
-from parlamentares.models import Filiacao, Parlamentar
+from parlamentares.models import Filiacao
 from sessao.models import (OrdemDia, PresencaOrdemDia, RegistroVotacao,
                            SessaoPlenaria, SessaoPlenariaPresenca,
                            VotoParlamentar)

sapl/settings.py

@@ -24,7 +24,6 @@ SECRET_KEY = '!9g1-#la+#(oft(v-y1qhy$jk-2$24pdk69#b_jfqyv!*%a_)t'
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
 
 ALLOWED_HOSTS = ['*']
 

sapl/test_general.py

@@ -15,6 +15,6 @@ def test_str_sanity():
             try:
                 str(obj)
             except Exception as exc:
-                msg = '%s.%s.__str__ has is broken.' % (
+                msg = '%s.%s.__str__ is broken.' % (
                     model.__module__, model.__name__)
                 raise AssertionError(msg, exc) from exc