diff --git a/tests/test_nanterre_synchronize_federations.py b/tests/test_nanterre_synchronize_federations.py index 037dfe7..6dc83e1 100644 --- a/tests/test_nanterre_synchronize_federations.py +++ b/tests/test_nanterre_synchronize_federations.py @@ -3,8 +3,6 @@ import csv import io -from django.utils.encoding import force_bytes - from webtest import Upload @@ -25,7 +23,7 @@ def test_synchronize_federations(settings, app, nanterre_classic_family, admin): response = response.click(u'Synchroniser les fédérations') response = response.click(u'Nouvel import') response.form.set('app_id', 'technocarte') - content = force_bytes('\n'.join(map(str, [f['kevin'].id + 1000, f['marie'].id + 1000, '99999']))) + content = ('\n'.join(map(str, [f['kevin'].id + 1000, f['marie'].id + 1000, '99999']))).encode() response.form.set('csv_uploaded', Upload('federations.csv', content, 'application/octet-stream')) response = response.form.submit().follow() assert len(response.pyquery('table#result-list tbody tr')) == 1 diff --git a/zoo/zoo_meta/models.py b/zoo/zoo_meta/models.py index 5b88baf..0daa570 100644 --- a/zoo/zoo_meta/models.py +++ b/zoo/zoo_meta/models.py @@ -18,7 +18,6 @@ from hashlib import md5 from django.apps import apps from django.db import models, connection -from django.utils.encoding import force_bytes from django.utils.translation import gettext_lazy as _ from django.contrib.postgres.fields import JSONField @@ -74,7 +73,7 @@ class CommonSchema(models.Model): def rebuild_string_index(self, cursor, table, path): expr = 'immutable_normalize((content%s))' % self.path_to_sql_expr(path) - key = md5(force_bytes(expr)).hexdigest()[:8] + key = md5(expr.encode()).hexdigest()[:8] sql = ('CREATE INDEX zoo_entity_%s_gin_%s_dynamic_idx ON %s USING gin ((%s) ' ' gin_trgm_ops) WHERE schema_id = %s' % (key, self.id, table, expr, self.id)) cursor.execute(sql) @@ -84,7 +83,7 @@ class CommonSchema(models.Model): def rebuild_string_date_time_index(self, cursor, table, path): expr = 'immutable_date(content%s)' % self.path_to_sql_expr(path) - key = md5(force_bytes(expr)).hexdigest()[:8] + key = md5(expr.encode()).hexdigest()[:8] sql = ('CREATE INDEX zoo_entity_%s_%s_dynamic_idx ON %s (%s) ' 'WHERE schema_id = %s' % (key, self.id, table, expr, self.id)) cursor.execute(sql) @@ -99,7 +98,7 @@ class CommonSchema(models.Model): else: raise NotImplementedError(self) - key = md5(force_bytes(expr)).hexdigest()[:8] + key = md5(expr.encode()).hexdigest()[:8] gin_sql = ('CREATE INDEX zoo_entity_%s_gin_%s_dynamic_idx ON %s USING gin ((%s) ' 'gin_trgm_ops) WHERE schema_id = %s' % (key, self.id, table, expr, self.id)) gist_sql = ('CREATE INDEX zoo_entity_%s_gist_%s_dynamic_idx ON %s USING gist ((%s)' diff --git a/zoo/zoo_nanterre/synchronize_federations.py b/zoo/zoo_nanterre/synchronize_federations.py index 823d4c4..bd5dc27 100644 --- a/zoo/zoo_nanterre/synchronize_federations.py +++ b/zoo/zoo_nanterre/synchronize_federations.py @@ -24,7 +24,6 @@ from django.urls import reverse from django.conf import settings from django.db import DatabaseError from django.db.transaction import atomic -from django.utils.encoding import force_bytes from zoo.zoo_meta.models import EntitySchema from zoo.zoo_data.models import Job, Entity, Transaction, Log