/usr/scripts sans / final

lc_ldap.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # LC_LDAP.PY-- LightWeight CransLdap
@@ -53,9 +52,9 @@ import variables
 import copy
 import itertools
 
-## import de /usr/scripts/
-if not "/usr/scripts/" in sys.path:
-    sys.path.append('/usr/scripts/')
+## import de /usr/scripts
+if "/usr/scripts" not in sys.path:
+    sys.path.append('/usr/scripts')
 
 import gestion.config as config
 import cranslib.deprecated

objets.py

@@ -56,9 +56,9 @@ import ldap_locks
 import variables
 import printing
 
-## import de /usr/scripts/
-if not "/usr/scripts/" in sys.path:
-    sys.path.append('/usr/scripts/')
+## import de /usr/scripts
+if "/usr/scripts" not in sys.path:
+    sys.path.append('/usr/scripts')
 
 import gestion.config as config
 import gestion.config.impression

shortcuts.py

@@ -15,7 +15,7 @@ try:
     from gestion import secrets_new as secrets
 except ImportError:
     sys.stderr.write("lc_ldap shortcuts: shaa, cannot import secrets_new. " +
-        "try again with /usr/scripts/ in PYTHONPATH " +
+        "try again with /usr/scripts in PYTHONPATH " +
         "(argv: %s)\n" % " ".join(getattr(sys, 'argv', [])))
     sys.path.append("/usr/scripts")
     from gestion import secrets_new as secrets

test.py

@@ -14,8 +14,6 @@ import lc_ldap
 import shortcuts
 import variables
 
-## import dans /usr/scripts/
-sys.path.append("/usr/scripts/")
 from gestion.affich_tools import anim, OK, cprint, ERREUR
 
 mail_format = False