Many fix for python3

1 files changed, 7 insertions, 7 deletions

diff --git a/chimere/tests.py b/chimere/tests.py
index 90e6143..e9f8e1f 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 
@@ -6,7 +6,7 @@ import datetime
 import lxml.etree
 import os
 from shutil import copyfile
-import simplejson as json
+import json
 test_path = os.path.abspath(__file__)
 test_dir_path = os.path.dirname(test_path) + os.sep
 
@@ -428,17 +428,17 @@ class AdminTest(AdministratorsTest):
         m_nok = self.markers[2]
         self.client.login(username='mod_1', password='pass')
         response = self.client.get('/admin/chimere/marker/')
-        self.assertTrue(str(self.subcategories[1]) in response.content)
+        self.assertTrue(str(self.subcategories[1]) in str(response.content))
         response = self.client.get('/admin/chimere/marker/{}/'.format(m_ok.pk))
         self.assertEqual(200, response.status_code)
-        self.assertTrue(str(self.subcategories[1]) in response.content)
+        self.assertTrue(str(self.subcategories[1]) in str(response.content))
         response = self.client.get(
             '/admin/chimere/marker/{}/'.format(m_nok.pk))
         self.assertEqual(200, response.status_code)
         self.client.logout()
         self.client.login(username='mod_2', password='pass')
         response = self.client.get('/admin/chimere/marker/')
-        self.assertFalse(str(self.subcategories[1]) in response.content)
+        self.assertFalse(str(self.subcategories[1]) in str(response.content))
         response = self.client.get('/admin/chimere/marker/{}/'.format(m_ok.pk))
         self.assertEqual(200, response.status_code)
         # functionnality currently disabled
@@ -562,7 +562,7 @@ class DynamicCategoryTest(TestCase):
         url = reverse('chimere:get_all_categories')
         response = self.client.get(url)
         self.assertEqual(200, response.status_code)
-        cats = json.loads(response.content)['categories']
+        cats = json.loads(str(response.content, 'utf-8'))['categories']
         self.assertEqual(len(cats), 5)
 
 
@@ -639,7 +639,7 @@ class RapprochementTest(TestCase):
         ref_marker = Marker.objects.get(pk=ref_marker.pk)
         self.assertEqual(Marker.objects.filter(ref_item=ref_marker,
                                                status='I').count(), 0)
-        for k in new_vals.keys() + ['import_version']:
+        for k in list(new_vals.keys()) + ['import_version']:
             self.assertEqual(getattr(ref_marker, k), values[k])
 
     def test_managed_modified_routes(self):