Migrate to python 3 - Clean old migrations and some old scripts

1 files changed, 61 insertions, 59 deletions

diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 0599a1599..9770d4b48 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -23,7 +23,7 @@ import datetime
 import io
 import os
 import shutil
-from StringIO import StringIO
+from io import StringIO
 
 from django.apps import apps
 
@@ -348,8 +348,8 @@ class WizardTest(object):
         return False
 
     def check_response(self, response, current_step, data_idx):
-        if "errorlist" in response.content:
-            soup = Soup(response.content, "lxml")
+        if "errorlist" in response.content.decode():
+            soup = Soup(response.content.decode(), "lxml")
             errorlist = soup.findAll(
                 "ul", {"class": "errorlist"})
             errors = []
@@ -464,11 +464,11 @@ class CacheTest(TestCase):
         org = models.OrganizationType.objects.create(
             txt_idx='test', label='testy')
         types = [
-            unicode(lbl) for idx, lbl in models.OrganizationType.get_types()]
+            str(lbl) for idx, lbl in models.OrganizationType.get_types()]
         self.assertTrue('testy' in types)
         org.delete()
         types = [
-            unicode(lbl) for idx, lbl in models.OrganizationType.get_types()]
+            str(lbl) for idx, lbl in models.OrganizationType.get_types()]
         self.assertFalse('testy' in types)
 
     def test_menu_cache(self):
@@ -489,17 +489,17 @@ class CacheTest(TestCase):
         c = Client()
         c.login(username=admin_username, password=admin_password)
         response = c.get("/operation_search/general-operation_search")
-        self.assertIn('href="/operation_modification/', response.content)
+        self.assertIn(b'href="/operation_modification/', response.content)
 
         # the cache menu must be updated...
         c2 = Client()
         c2.login(username=readonly_user, password=readonly_password)
         response = c2.get("/operation_search/general-operation_search")
-        self.assertNotIn('href="/operation_modification/', response.content)
+        self.assertNotIn(b'href="/operation_modification/', response.content)
 
         # ... only on a session basis
         response = c.get("/operation_search/general-operation_search")
-        self.assertIn('href="/operation_modification/', response.content)
+        self.assertIn(b'href="/operation_modification/', response.content)
 
 
 class AccessControlTest(TestCase):
@@ -591,7 +591,7 @@ class UserProfileTest(TestCase):
         response = self.client.post(
             base_url, {'name': "New name", "current_profile": new_profile.pk})
         self.assertIn(
-            "errorlist nonfield", response.content,
+            b"errorlist nonfield", response.content,
             msg="An error should be isplayed as this name is already taken"
         )
 
@@ -683,7 +683,7 @@ class AdminGenTypeTest(TestCase):
                 response.status_code, 200,
                 msg="Can not export as CSV for {}.".format(model))
             try:
-                f = io.BytesIO(response.content)
+                f = io.StringIO(response.content.decode())
                 reader = csv.DictReader(f)
                 for row in reader:
                     if 'txt_idx' in row:
@@ -983,36 +983,36 @@ class ShortMenuTest(TestCase):
             year=2042, operation_code=54
         )
 
-    def testNotConnected(self):
+    def test_not_connected(self):
         c = Client()
         response = c.get(reverse('shortcut-menu'))
         # no content if not logged
-        self.assertFalse("shortcut-menu" in response.content)
+        self.assertFalse(b"shortcut-menu" in response.content)
         c = Client()
         c.login(username=self.username, password=self.password)
         # no content because the user owns no object
         response = c.get(reverse('shortcut-menu'))
-        self.assertFalse("shortcut-menu" in response.content)
+        self.assertFalse(b"shortcut-menu" in response.content)
         self._create_ope(user=self.user)
         # content is here
         response = c.get(reverse('shortcut-menu'))
-        self.assertTrue("shortcut-menu" in response.content)
+        self.assertTrue(b"shortcut-menu" in response.content)
 
-    def testOperation(self):
+    def test_operation(self):
         c = Client()
         c.login(username=self.username, password=self.password)
         ope = self._create_ope()
         # not available at first
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertFalse(str(ope.cached_label) in response.content)
+        self.assertFalse(str(ope.cached_label) in response.content.decode())
 
         # available because is the creator
         ope.history_creator = self.user
         ope.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(ope.cached_label) in response.content)
+        self.assertTrue(str(ope.cached_label) in response.content.decode())
 
         # available because is in charge
         ope.history_creator = self.other_user
@@ -1020,7 +1020,7 @@ class ShortMenuTest(TestCase):
         ope.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(ope.cached_label) in response.content)
+        self.assertTrue(str(ope.cached_label) in response.content.decode())
 
         # available because is the scientist
         ope.history_creator = self.other_user
@@ -1029,14 +1029,14 @@ class ShortMenuTest(TestCase):
         ope.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(ope.cached_label) in response.content)
+        self.assertTrue(str(ope.cached_label) in response.content.decode())
 
         # end date is reached - no more available
         ope.end_date = datetime.date(1900, 1, 1)
         ope.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertFalse(str(ope.cached_label) in response.content)
+        self.assertFalse(str(ope.cached_label) in response.content.decode())
 
         # test current is not owned
         ope.end_date = None
@@ -1049,7 +1049,7 @@ class ShortMenuTest(TestCase):
         session.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(ope.cached_label) in response.content)
+        self.assertTrue(str(ope.cached_label) in response.content.decode())
 
     def testFile(self):
         from archaeological_files.models import File, FileType
@@ -1064,14 +1064,14 @@ class ShortMenuTest(TestCase):
         # not available at first
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertFalse(str(fle.cached_label) in response.content)
+        self.assertFalse(str(fle.cached_label) in response.content.decode())
 
         # available because is the creator
         fle.history_creator = self.user
         fle.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(fle.cached_label) in response.content)
+        self.assertTrue(str(fle.cached_label) in response.content.decode())
 
         # available because is in charge
         fle.history_creator = self.other_user
@@ -1079,14 +1079,14 @@ class ShortMenuTest(TestCase):
         fle.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(fle.cached_label) in response.content)
+        self.assertTrue(str(fle.cached_label) in response.content.decode())
 
         # end date is reached - no more available
         fle.end_date = datetime.date(1900, 1, 1)
         fle.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertFalse(str(fle.cached_label) in response.content)
+        self.assertFalse(str(fle.cached_label) in response.content.decode())
 
     def _create_cr(self):
         from archaeological_context_records.models import ContextRecord
@@ -1113,14 +1113,14 @@ class ShortMenuTest(TestCase):
         # not available at first
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertFalse(str(cr.cached_label) in response.content)
+        self.assertFalse(str(cr.cached_label) in response.content.decode())
 
         # available because is the creator
         cr.history_creator = self.user
         cr.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(cr.cached_label) in response.content)
+        self.assertTrue(str(cr.cached_label) in response.content.decode())
 
         # available because is in charge
         cr.history_creator = self.other_user
@@ -1129,7 +1129,7 @@ class ShortMenuTest(TestCase):
         cr.operation.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(cr.cached_label) in response.content)
+        self.assertTrue(str(cr.cached_label) in response.content.decode())
 
         # available because is the scientist
         cr.history_creator = self.other_user
@@ -1139,7 +1139,7 @@ class ShortMenuTest(TestCase):
         cr.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(cr.cached_label) in response.content)
+        self.assertTrue(str(cr.cached_label) in response.content.decode())
 
     def _create_find(self):
         from archaeological_finds.models import BaseFind, Find
@@ -1161,14 +1161,14 @@ class ShortMenuTest(TestCase):
         # not available at first
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertFalse(str(find.cached_label) in response.content)
+        self.assertFalse(str(find.cached_label) in response.content.decode())
 
         # available because is the creator
         find.history_creator = self.user
         find.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(find.cached_label) in response.content)
+        self.assertTrue(str(find.cached_label) in response.content.decode())
 
         # available because is in charge
         find.history_creator = self.other_user
@@ -1178,7 +1178,7 @@ class ShortMenuTest(TestCase):
         base_find.context_record.operation.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(find.cached_label) in response.content)
+        self.assertTrue(str(find.cached_label) in response.content.decode())
 
         # available because is the scientist
         find.history_creator = self.other_user
@@ -1189,7 +1189,7 @@ class ShortMenuTest(TestCase):
         base_find.context_record.operation.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(find.cached_label) in response.content)
+        self.assertTrue(str(find.cached_label) in response.content.decode())
 
     def testBasket(self):
         c = Client()
@@ -1202,14 +1202,14 @@ class ShortMenuTest(TestCase):
         # not available at first
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertFalse(str(basket.label) in response.content)
+        self.assertFalse(str(basket.label) in response.content.decode())
 
         # available because is the owner
         basket.user = self.user.ishtaruser
         basket.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(basket.label) in response.content)
+        self.assertTrue(str(basket.label) in response.content.decode())
 
     def test_treatment_file(self):
         c = Client()
@@ -1224,14 +1224,14 @@ class ShortMenuTest(TestCase):
         # not available at first
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertFalse(str(tf.cached_label) in response.content)
+        self.assertFalse(str(tf.cached_label) in response.content.decode())
 
         # available because is the creator
         tf.history_creator = self.user
         tf.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(tf.cached_label) in response.content)
+        self.assertTrue(str(tf.cached_label) in response.content.decode())
 
         # available because is in charge
         tf.history_creator = self.other_user
@@ -1239,14 +1239,14 @@ class ShortMenuTest(TestCase):
         tf.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(tf.cached_label) in response.content)
+        self.assertTrue(str(tf.cached_label) in response.content.decode())
 
         # end date is reached - no more available
         tf.end_date = datetime.date(1900, 1, 1)
         tf.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertFalse(str(tf.cached_label) in response.content)
+        self.assertFalse(str(tf.cached_label) in response.content.decode())
 
     def _create_treatment(self):
         from archaeological_finds.models import Treatment, TreatmentState
@@ -1267,14 +1267,14 @@ class ShortMenuTest(TestCase):
         # not available at first
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertFalse(str(treat.cached_label) in response.content)
+        self.assertFalse(str(treat.cached_label) in response.content.decode())
 
         # available because is the creator
         treat.history_creator = self.user
         treat.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(treat.cached_label) in response.content)
+        self.assertTrue(str(treat.cached_label) in response.content.decode())
 
         # available because is in charge
         treat.history_creator = self.other_user
@@ -1282,14 +1282,14 @@ class ShortMenuTest(TestCase):
         treat.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(str(treat.cached_label) in response.content)
+        self.assertTrue(str(treat.cached_label) in response.content.decode())
 
         # end date is reached - no more available
         treat.end_date = datetime.date(1900, 1, 1)
         treat.save()
         response = c.get(reverse('shortcut-menu'))
         self.assertEqual(response.status_code, 200)
-        self.assertFalse(str(treat.cached_label) in response.content)
+        self.assertFalse(str(treat.cached_label) in response.content.decode())
 
     def test_pin_search(self):
         c = Client()
@@ -1385,16 +1385,18 @@ class ImportTest(TestCase):
             '../archaeological_operations/tests/MCC-operations-example.csv',
             dest
         )
-        mcc_operation_file = DjangoFile(file(dest, 'rb'))
-        imprt = models.Import.objects.create(
-            user=models.IshtarUser.objects.all()[0],
-            importer_type=importer_type,
-            imported_file=mcc_operation_file)
-
-        town.imports.add(imprt)
-        imprt.delete()
-        # town should be deleted
-        self.assertEqual(models.Town.objects.filter(name='my-test').count(), 0)
+        with open(dest, 'rb') as f:
+            mcc_operation_file = DjangoFile(f)
+            imprt = models.Import.objects.create(
+                user=models.IshtarUser.objects.all()[0],
+                importer_type=importer_type,
+                imported_file=mcc_operation_file)
+
+            town.imports.add(imprt)
+            imprt.delete()
+            # town should be deleted
+            self.assertEqual(models.Town.objects.filter(name='my-test').count(),
+                             0)
 
     def test_keys(self):
         content_type = ContentType.objects.get_for_model(
@@ -1492,12 +1494,12 @@ class IshtarSiteProfileTest(TestCase):
         c = Client()
         c.login(username=username, password=password)
         response = c.get(reverse('start'))
-        self.assertNotIn('href="/file_search/"', response.content)
+        self.assertNotIn(b'href="/file_search/"', response.content)
         profile = models.get_current_profile()
         profile.files = True
         profile.save()
         response = c.get(reverse('start'))
-        self.assertIn('href="/file_search/"', response.content)
+        self.assertIn(b'href="/file_search/"', response.content)
 
     def testExternalKey(self):
         profile = models.get_current_profile()
@@ -1542,21 +1544,21 @@ class IshtarBasicTest(TestCase):
         response = c.get(reverse('show-person', kwargs={'pk': person.pk}))
         self.assertEqual(response.status_code, 200)
         # empty content when not allowed
-        self.assertEqual(response.content, "")
+        self.assertEqual(response.content, b"")
         response = c.get(reverse('show-organization',
                                  kwargs={'pk': company.pk}))
         self.assertEqual(response.status_code, 200)
         # empty content when not allowed
-        self.assertEqual(response.content, "")
+        self.assertEqual(response.content, b"")
 
         c.login(username=self.my_admin.username, password=self.password)
         response = c.get(reverse('show-person', kwargs={'pk': person.pk}))
         self.assertEqual(response.status_code, 200)
-        self.assertIn('class="card sheet"', response.content)
+        self.assertIn(b'class="card sheet"', response.content)
         response = c.get(reverse('show-organization',
                                  kwargs={'pk': company.pk}))
         self.assertEqual(response.status_code, 200)
-        self.assertIn('class="card sheet"', response.content)
+        self.assertIn(b'class="card sheet"', response.content)
 
     def test_town_cache(self):
         models.Town.objects.create(name="Sin City", numero_insee="99999")