From c6cc1811b80c570aa18897b1ad060a49c563c69c Mon Sep 17 00:00:00 2001 From: Paul Marillonnet Date: Mon, 25 Sep 2017 19:20:22 +0200 Subject: [PATCH] POC Campus Condorcet : correction encodage et charset --- django/sp_sso/saml/utils.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/django/sp_sso/saml/utils.py b/django/sp_sso/saml/utils.py index 4fa6d6c..cc44b49 100644 --- a/django/sp_sso/saml/utils.py +++ b/django/sp_sso/saml/utils.py @@ -32,6 +32,12 @@ supann_host_role_attribute = 'supannRoleGenerique' supann_host_role_value = '{SUPANN}R10' # 'Responsable de mission' +def sorting_key(tuple_input): + if type(tuple_input[1]) is unicode: + return tuple_input[1].encode('utf-8') + else: + return unicode(tuple_input[1], 'utf-8') + def render_message(request, message): """Renders a simple message to a base template""" return render(request, 'simple_message.html', {'message': message}) @@ -114,7 +120,7 @@ def ldap_get_attribute_from_subtree_nodes(subtree_base, filter, attribute): description = node_data.get('description', [_('No description')])[0] choices.append((attribute_value, description)) - choices.sort(key=lambda x: unicode(x[1], 'utf-8')) + choices.sort(key=sorting_key) return choices def ldap_terminate(l):