misc: make normalize() return str (#44146)

passerelle/apps/gdc/views.py

@@ -144,7 +144,7 @@ class PostDemandeView(View, SingleObjectMixin):
             except GdcCrash:
                 result = {'result': 'gdc soap crash'}
                 return utils.response_for_json(request, result)
-            normalized_voie = normalize(voie_str).decode('ascii').upper()
+            normalized_voie = normalize(voie_str).upper()
             for k, v in voies:
                 if v == normalized_voie or k == normalized_voie:
                     voie_id = k

passerelle/contrib/toulouse_axel/utils.py

@@ -26,6 +26,8 @@ import pytz
 
 from django.utils.six import string_types
 
+from passerelle.utils.conversion import normalize
+
 
 boolean_type = {
     'oneOf': [
@@ -166,7 +168,7 @@ def upperize(data):
         for i, val in enumerate(data):
             data[i] = upperize(val)
     if isinstance(data, string_types):
-        data = unicodedata.normalize('NFKD', data).encode('ascii', 'ignore').decode('ascii').upper()
+        data = normalize(data).upper()
     return data
 
 

passerelle/utils/conversion.py

@@ -97,7 +97,7 @@ def exception_to_text(e):
 
 
 def normalize(s):
-    return unicodedata.normalize('NFKD', s).encode('ascii', 'ignore')
+    return unicodedata.normalize('NFKD', s).encode('ascii', 'ignore').decode('ascii')
 
 
 def simplify(s):
@@ -108,7 +108,7 @@ def simplify(s):
     if not s:
         return ''
     s = force_text(s, 'utf-8', 'ignore')
-    s = force_text(normalize(s))
+    s = normalize(s)
     s = re.sub(r'[^\w\s\'-]', '', s)
     s = re.sub(r'[\s\'_-]+', ' ', s)
     return s.strip().lower()