Fix qa e testes

compilacao/views.py

@@ -18,8 +18,8 @@ from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic.base import TemplateView
 from django.views.generic.detail import DetailView
-from django.views.generic.edit import (CreateView, DeleteView,
+from django.views.generic.edit import (CreateView, DeleteView, FormView,
-                                       FormView, UpdateView)
+                                       UpdateView)
 from django.views.generic.list import ListView
 
 from compilacao.forms import (DispositivoDefinidorVigenciaForm,

materia/tests/test_materia.py

@@ -403,7 +403,7 @@ def test_form_errors_tramitacao(client):
 def test_form_errors_relatoria(client):
     materia_principal = make_materia_principal()
 
-    response = client.post(reverse('materia:relatoria',
+    response = client.post(reverse('materia:relatoria_create',
                                    kwargs={'pk': materia_principal.pk}),
                            {'salvar': 'salvar'},
                            follow=True)

materia/tests/test_materia_urls.py

@@ -3,9 +3,9 @@ from django.core.urlresolvers import reverse
 
 
 @pytest.mark.parametrize("test_input,kwargs,expected", [
-    ('materia:relatoria_edit',
+    ('materia:relatoria_update',
-        {'pk': '11', 'id': '99'},
+        {'pk': '11'},
-        '/materia/11/relatoria/99/edit'),
+        '/materia/relatoria/11/edit'),
     ('materia:tramitacao_update',
         {'pk': '8'},
         '/materia/tramitacao/8/edit'),

materia/views.py

@@ -11,13 +11,12 @@ from django.http.response import HttpResponseRedirect
 from django.shortcuts import redirect
 from django.template import Context, loader
 from django.utils.translation import ugettext_lazy as _
-from django.views.generic import CreateView, FormView, ListView, TemplateView
+from django.views.generic import CreateView, ListView, TemplateView
 from django_filters.views import FilterView
 
 import crud.base
 import crud.masterdetail
 from base.models import CasaLegislativa
-from comissoes.models import Comissao, Composicao
 from compilacao.views import IntegracaoTaView
 from crud.base import Crud, make_pagination
 from crud.masterdetail import MasterDetailCrud

protocoloadm/views.py

@@ -4,7 +4,7 @@ from datetime import date, datetime
 from braces.views import FormValidMessageMixin
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
-from django.db.models import Max, Q
+from django.db.models import Q, Max
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _