From c3f822c823e9e67e228538f5ddd76626898db120 Mon Sep 17 00:00:00 2001
From: Emmanuel Cazenave <ecazenave@entrouvert.com>
Date: Wed, 5 Feb 2020 15:03:55 +0100
Subject: [PATCH] tests: use force_text() before json.loads() (#39560)

python<3.6 compatibility.
---
 tests/test_main.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/test_main.py b/tests/test_main.py
index b1109d2..48174a7 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -8,6 +8,7 @@ from django.test import TestCase
 from django.test.client import Client
 
 from django.core.urlresolvers import reverse
+from django.utils.encoding import force_text
 
 from passerelle_montpellier_encombrants.models import (
     EncombrantsManagement, Commune, Sector, CollectDay, Street)
@@ -46,12 +47,12 @@ class EncombrantsTestCase(TestCase):
         for commune in Commune.objects.all():
             r = self.client.get(reverse('montpellier-encombrants-available-days',
                             kwargs={'slug': self.instance.slug, 'insee': commune.insee}))
-            data = json.loads(r.content)
+            data = json.loads(force_text(r.content))
             self.assertNotEqual(data['data'], [])
             r = self.client.get(reverse('montpellier-encombrants-available-days',
                                         kwargs={'slug': self.instance.slug,
                                         'insee': commune.insee}), params)
-            data = json.loads(r.content)
+            data = json.loads(force_text(r.content))
             self.assertNotEqual(data['data'], [])
 
     def test_collectdays_in_communes_with_street(self):
@@ -76,7 +77,7 @@ class EncombrantsTestCase(TestCase):
         r = self.client.get(reverse('montpellier-encombrants-available-days',
                                 kwargs={'slug': self.instance.slug,
                                 'insee': '34970'}), {'adresse': 'PLAN DU MAS DE SARDAN'})
-        data = json.loads(r.content)
+        data = json.loads(force_text(r.content))
         self.assertNotEqual(data['data'], [])
 
         # Lattes
@@ -86,7 +87,7 @@ class EncombrantsTestCase(TestCase):
         r = self.client.get(reverse('montpellier-encombrants-available-days',
                                 kwargs={'slug': self.instance.slug,
                                 'insee': '34970'}), {'adresse': 'ROUTE DEPARTEMENTALE 172'})
-        data = json.loads(r.content)
+        data = json.loads(force_text(r.content))
         self.assertEqual(data['data'], [])
 
         CollectDay.objects.create(sector=lattes_sector,
@@ -95,7 +96,7 @@ class EncombrantsTestCase(TestCase):
         r = self.client.get(reverse('montpellier-encombrants-available-days',
                                 kwargs={'slug': self.instance.slug,
                                 'insee': '34970'}), {'adresse': 'ROUTE DEPARTEMENTALE 172'})
-        data = json.loads(r.content)
+        data = json.loads(force_text(r.content))
         self.assertNotEqual(data['data'], [])
 
 
@@ -103,7 +104,7 @@ class EncombrantsTestCase(TestCase):
         r = self.client.get(reverse('montpellier-encombrants-available-days',
                                 kwargs={'slug': self.instance.slug,
                                 'insee': '34970'}), {'adresse': 'Nonexisting street'})
-        data = json.loads(r.content)
+        data = json.loads(force_text(r.content))
         self.assertEqual(data['data'], [])
 
     def test_collectdays_random_case_street(self):
@@ -120,5 +121,5 @@ class EncombrantsTestCase(TestCase):
         r = self.client.get(reverse('montpellier-encombrants-available-days',
                                 kwargs={'slug': self.instance.slug,
                                 'insee': '34970'}), {'adresse': 'route departementale 172'})
-        data = json.loads(r.content)
+        data = json.loads(force_text(r.content))
         self.assertNotEqual(data['data'], [])