From 8ea0f1d0e6ec7ada447fa591f33091e4d5e2cb68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Thu, 30 May 2013 02:11:27 +0200 Subject: [PATCH] =?UTF-8?q?[ldap=5Fcrans]=20"syslog"=20essaie=20d'=C3=A9cr?= =?UTF-8?q?ire=20dans=20un=20fichier,=20m=C3=AAme=20si=20le=20truc=20?= =?UTF-8?q?=C3=A0=20=C3=A9crire=20est=20unicode...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestion/gest_crans.py | 4 ++-- gestion/ldap_crans.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gestion/gest_crans.py b/gestion/gest_crans.py index 3fa05767..4373285d 100755 --- a/gestion/gest_crans.py +++ b/gestion/gest_crans.py @@ -1937,7 +1937,7 @@ def select(clas, quoi, mde=''): filtre_adher = u'nom=%s&prenom=%s&tel=%s&chbre=%s&aid=%s&mail=%s&' % tuple(s[:6]) filtre_machine = u'host=%s&macAddress=%s&ipHostNumber=%s&mid=%s&' % tuple(s[6:]) - filtre= '' + filtre = u'' if filtre_adher.count('=*&') != 6: # Au moins une condition adhérent filtre += filtre_adher[:-1] @@ -1951,7 +1951,7 @@ def select(clas, quoi, mde=''): arg += u'--msgbox "Il faut au moins une condition.\n\n\n" 0 0' dialog(arg) continue - + ### Recherche try: if mde == 'ro': diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py index 0554e85c..764692d4 100755 --- a/gestion/ldap_crans.py +++ b/gestion/ldap_crans.py @@ -684,18 +684,18 @@ class CransLdap: Si mode='w', les instances crées seront en mode d'écriture """ + if isinstance(expression, str): + pass + elif isinstance(expression, unicode): + expression = expression.encode('utf-8') + else: + raise TypeError(u'Chaîne attendue') + if os.getuid() != 0: openlog('CransLdap.search') syslog('(%s,%s) %s' % (script_utilisateur, mode, expression)) closelog() - if type(expression) == str: - pass - elif type(expression) == unicode: - expression = expression.encode('utf-8') - else: - raise TypeError(u'Chaîne attendue') - if not expression: return []