Port remaining cases to python 3

base/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

comissoes/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

legacy/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

legacy/models.py

@@ -7,7 +7,7 @@
 #
 # Also note: You'll have to insert the output of 'django-admin sqlcustom [app_label]'
 # into your database.
-from __future__ import unicode_literals
+
 
 from django.db import models
 

legacy/scripts/scrap_original_forms.py

@@ -6,9 +6,9 @@ import string
 from bs4 import BeautifulSoup
 from bs4.element import NavigableString, Tag
 
-from field_renames import field_renames
-from migration import appconfs
-from utils import listify, getsourcelines
+from .field_renames import field_renames
+from .migration import appconfs
+from .utils import listify, getsourcelines
 
 
 assert appconfs  # to prevent removal by automatic organize imports on this file

legacy/scripts/study.py

@@ -1,6 +1,6 @@
 from django.apps import apps
 
-from migration_base import legacy_app
+from .migration_base import legacy_app
 
 
 for model in apps.get_app_config('legacy').get_models():

lexml/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

materia/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

materia/migrations/0002_auto_20150707_0945.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

norma/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

parlamentares/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

protocoloadm/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

sapl/test_utils.py

@@ -1,5 +1,5 @@
 from pytest import mark
-from utils import make_choices
+from .utils import make_choices
 
 
 @mark.parametrize("choice_pairs, result", [

sapl/utils.py

@@ -15,8 +15,8 @@ def register_all_models_in_admin(module_name):
 
 def make_choices(*choice_pairs):
     assert len(choice_pairs) % 2 == 0
-    choice_pairs = iter(choice_pairs)
-    choices = zip(choice_pairs, choice_pairs)
+    ipairs = iter(choice_pairs)
+    choices = list(zip(ipairs, ipairs))
     yield choices
     for key, value in choices:
         yield key

sessao/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations