From 0152d1a48f3dedfff6171bfdc8d9387f44e8b7a3 Mon Sep 17 00:00:00 2001
From: VictorFabreF <victorfabre@me.com>
Date: Wed, 4 Apr 2018 14:26:33 -0300
Subject: [PATCH] Fix #1827

---
 requirements/requirements.txt          | 2 +-
 sapl/base/tests/teststub_urls.py       | 8 +++-----
 sapl/comissoes/tests/test_comissoes.py | 1 +
 sapl/materia/forms.py                  | 2 +-
 sapl/test_urls.py                      | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index fe2e139c8..fb6ab96b1 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,6 +1,6 @@
 dj-database-url==0.4.1
 django-haystack==2.6.0
-django>=1.9,<1.10
+django>=1.10,<1.11
 # TODO O django-admin-bootstrapped 2.5.7 não inseriu a mudança que permite
 # a compatibilidade com Django 1.9+. A linha abaixo será mudada quando uma
 # nova versão do django-admin-bootstrapped for lançada
diff --git a/sapl/base/tests/teststub_urls.py b/sapl/base/tests/teststub_urls.py
index 9796768f2..8b66d6586 100644
--- a/sapl/base/tests/teststub_urls.py
+++ b/sapl/base/tests/teststub_urls.py
@@ -1,11 +1,9 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.views.generic.base import TemplateView
 
 from sapl.urls import urlpatterns as original_patterns
 
-ptrn = patterns('',
-                url(r'^zzzz$',
+ptrn = [url(r'^zzzz$',
                     TemplateView.as_view(
-                        template_name='index.html'), name='zzzz'))
-
+                        template_name='index.html'), name='zzzz')]
 urlpatterns = original_patterns + ptrn
diff --git a/sapl/comissoes/tests/test_comissoes.py b/sapl/comissoes/tests/test_comissoes.py
index fee303192..055214616 100644
--- a/sapl/comissoes/tests/test_comissoes.py
+++ b/sapl/comissoes/tests/test_comissoes.py
@@ -72,6 +72,7 @@ def test_incluir_comissao_submit(admin_client):
                                   'nome': 'Comissão Teste',
                                   'sigla': 'CT',
                                   'data_criacao': '2016-03-22',
+                                  'unidade_deliberativa': True,
                                   'salvar': 'salvar'},
                                  follow=True)
     assert response.status_code == 200
diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py
index 3d455ea29..e75c6beb8 100644
--- a/sapl/materia/forms.py
+++ b/sapl/materia/forms.py
@@ -1106,7 +1106,7 @@ class TipoProposicaoSelect(Select):
             str(data_has_perfil),
             force_text(option_label))
 
-    def render_options(self, choices, selected_choices):
+    def render_options(self, selected_choices):
         # Normalize to strings.
         selected_choices = set(force_text(v) for v in selected_choices)
         output = []
diff --git a/sapl/test_urls.py b/sapl/test_urls.py
index 8423a98ed..5670f7bff 100644
--- a/sapl/test_urls.py
+++ b/sapl/test_urls.py
@@ -56,7 +56,7 @@ def create_perms_post_migrate(sapl_app_config):
             ctype = ContentType.objects.get_for_model(klass)
 
         ctypes.add(ctype)
-        for perm in _get_all_permissions(klass._meta, ctype):
+        for perm in _get_all_permissions(klass._meta):
             searched_perms.append((ctype, perm))
 
     all_perms = set(Permission.objects.filter(