forward.py: indentation bullshit

gestion/forward.py

@@ -29,20 +29,19 @@ import lc_ldap.shortcuts
 import lc_ldap.printing
 import lc_ldap.filter2 as filter
 
-
-if __name__ == '__main__':
-# Lecture de la redirection courante
 def redirection_read(uid):
+    """ Lecture de la redirection courante"""
     forward = open(os.path.expanduser('~%s/.forward' %uid) ,'r')
     print forward.read()
     forward.close()
-    return
-# Modification de la redirection
+
 def redirection_write(ligne,uid):
+    """ Modification de la redirection"""
     forward = open(os.path.expanduser('~%s/.forward' %uid),'w')
     forward.write('%s' %ligne)
     forward.close()
-    return
+
+if __name__ == '__main__':
 
     # On reprends whos_lc() de Valentin
     if len(sys.argv) >1:
@@ -51,18 +50,16 @@ if __name__ == '__main__':
         if not result:
             print "Aucun résultat !"
             exit()
-        else:
-            if len(result) == 1:
-                if len(result[0].get(u'droits',None))==0:
-            result[0].display()
-            uid=result[0].get(u'uid',None)[0].value
-        if len(result[0].get(u'droits',None))!=0:
-            print 'Membre actif !'
-            exit()
-            else:
+        elif len(result) > 1:
             print lc_ldap.printing.sprint_list(result)
             print "%s résultats" % len(result)
             exit()
+        elif result[0].get(u'droits',None):
+            print 'Membre actif !'
+            exit()
+        else:
+            result[0].display()
+            uid=result[0].get(u'uid',None)[0].value
     else:
         sys.stderr.write("Utiliser les filtres ldap: uid=, chbre= etc..")
         exit()
@@ -81,6 +78,3 @@ if r == 'O' or r == 'o':
     elif r == 'N' or r == 'n':
         exit()
 
-
-
-