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

1 files changed, 10 insertions, 10 deletions

diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py
index 7d6ede6f5..d78fa0e68 100644
--- a/archaeological_files/tests.py
+++ b/archaeological_files/tests.py
@@ -41,7 +41,7 @@ def create_administrativact(user, fle):
     dct = {'history_modifier': user,
            'act_type': act_type,
            'associated_file': fle,
-           'signature_date': datetime.date(2017, 07, 10),
+           'signature_date': datetime.date(2017, 7, 10),
            'index': 22}
     adminact, created = AdministrativeAct.objects.get_or_create(**dct)
     return [act_type], [adminact]
@@ -147,14 +147,14 @@ class FileTest(TestCase, FileInit):
                             msg=u'%s not in new values' % k)
             self.assertEqual(
                 new_values[k], initial_values[k],
-                msg=u"for %s: %s != %s" % (k, unicode(new_values[k]),
-                                           unicode(initial_values[k])))
+                msg=u"for %s: %s != %s" % (k, str(new_values[k]),
+                                           str(initial_values[k])))
 
     def testRESTGetFile(self):
         response = self.client.post(
             '/get-file/', {'numeric_reference': self.item.numeric_reference})
         self.assertEqual(response.status_code, 200)
-        data = json.loads(response.content)
+        data = json.loads(response.content.decode())
         # not allowed -> no data
         self.assertTrue(not data)
 
@@ -162,7 +162,7 @@ class FileTest(TestCase, FileInit):
         response = self.client.post(
             '/get-file/', {'numeric_reference': self.item.numeric_reference})
         self.assertEqual(response.status_code, 200)
-        data = json.loads(response.content)
+        data = json.loads(response.content.decode())
         self.assertTrue('recordsTotal' in data)
         self.assertEqual(data['recordsTotal'], 1)
 
@@ -178,7 +178,7 @@ class FileTest(TestCase, FileInit):
             '/get-file/',
             {'numeric_reference': item.numeric_reference, 'old': 1})
         self.assertEqual(response.status_code, 200)
-        data = json.loads(response.content)
+        data = json.loads(response.content.decode())
         # not allowed -> no data
         self.assertTrue(not data)
 
@@ -187,7 +187,7 @@ class FileTest(TestCase, FileInit):
             '/get-file/',
             {'numeric_reference': item.numeric_reference, 'old': 1})
         self.assertEqual(response.status_code, 200)
-        data = json.loads(response.content)
+        data = json.loads(response.content.decode())
         self.assertIn('recordsTotal', data)
         self.assertEqual(data['recordsTotal'], 1)
         self.assertEqual(data['rows'][0]['internal_reference'], initial_ref)
@@ -220,12 +220,12 @@ class FileTest(TestCase, FileInit):
         response = self.client.get(reverse(url, kwargs={'pk': pk}))
         self.assertEqual(response.status_code, 200)
         # empty content when not allowed
-        self.assertEqual(response.content, "")
+        self.assertEqual(response.content.decode(), "")
 
         self.login_as_superuser()
         response = self.client.get(reverse(url, kwargs={'pk': pk}))
         self.assertEqual(response.status_code, 200)
-        self.assertIn('class="card sheet"', response.content)
+        self.assertIn('class="card sheet"', response.content.decode())
 
 
 class FileOperationTest(TestCase, OperationInitTest, FileInit):
@@ -243,7 +243,7 @@ class FileOperationTest(TestCase, OperationInitTest, FileInit):
         default_town = Town.objects.all()[0]
         for p in range(0, 10):
             parcel = Parcel.objects.create(
-                parcel_number=unicode(p),
+                parcel_number=str(p),
                 section='YY',
                 town=default_town,
                 operation=self.operation)