chore: historic fix for values None inside an array (#2389)

Author: Destinyyyy

core/lib/text.py

@@ -32,10 +32,7 @@ def humanize_value(value, choices=None):
     if choices and (isinstance(value, (bool, str, tuple, list)) or value is None):
         values = [value] if not isinstance(value, (tuple, list)) else value
         mapped_choices = _humanize_map_choices(values, dict(choices))
-        if isinstance(mapped_choices, (list, tuple)):
-            value = ", ".join(mapped_choices)
-        else:
-            value = mapped_choices
+        value = ", ".join(mapped_choices)
     elif value is None:
         pass
     elif isinstance(value, (tuple, list)):
@@ -55,7 +52,7 @@ def humanize_value(value, choices=None):
     else:
         raise NotImplementedError("Type of value isn't recognized : %s" % type(value))
 
-    return "Vide" if value in ("", None, [], ()) else value
+    return "Inconnu" if value in ("", "None", None, [], ()) else value
 
 
 def normalize_nom(nom):

tests/core/test_text.py

@@ -41,10 +41,10 @@ def test_contains_sequence(test, source, expected):
     [
         (True, "Oui", None),
         (False, "Non", None),
-        (None, "Vide", None),
-        ("", "Vide", None),
-        ([], "Vide", None),
-        ((), "Vide", None),
+        (None, "Inconnu", None),
+        ("", "Inconnu", None),
+        ([], "Inconnu", None),
+        ((), "Inconnu", None),
         (1, "1", None),
         (0, "0", None),
         (0.2, "0.2", None),

tests/erp/test_browser.py

@@ -955,9 +955,9 @@ def get_entry(field, diff_entries):
 
     assert len(a11y_diff) == 4
 
-    assert get_entry("cheminement_ext_nombre_marches", a11y_diff)["old"] == "Vide"
+    assert get_entry("cheminement_ext_nombre_marches", a11y_diff)["old"] == "Inconnu"
     assert get_entry("cheminement_ext_nombre_marches", a11y_diff)["new"] == "42"
-    assert str(get_entry("labels", a11y_diff)["old"]) == "Vide"
+    assert str(get_entry("labels", a11y_diff)["old"]) == "Inconnu"
     assert str(get_entry("labels", a11y_diff)["new"]) == "Destination pour Tous, Tourisme & Handicap"
 
 

tests/erp/test_schema.py

@@ -75,8 +75,9 @@ def test_get_help_text():
         ("accueil_cheminement_nombre_marches", 1, "1"),
         ("accueil_cheminement_nombre_marches", 0, "0"),
         ("cheminement_ext_devers", "important", "Important"),
+        ("accueil_equipements_malentendants", [None], "Inconnu"),
         ("labels", ["dpt", "th"], "Destination pour Tous, Tourisme & Handicap"),
-        ("labels", [], "Vide"),
+        ("labels", [], "Inconnu"),
     ],
 )
 def test_get_human_readable_value_ok(field, value, expected):

tests/subscription/test_commands.py

@@ -225,12 +225,6 @@ def test_notification_accessibilite(client, mocker):
                                     "new": "Inconnu",
                                     "label": "Audiodescription",
                                 },
-                                {
-                                    "field": "accueil_audiodescription",
-                                    "old": "Vide",
-                                    "new": "None",
-                                    "label": "Type d'équipements pour l'audiodescription",
-                                },
                                 {
                                     "field": "accueil_retrecissement",
                                     "old": "Oui",