import via /usr/scripts

gestion/gen_confs/__init__.py

@@ -8,14 +8,16 @@ Licence : GPLv2
 """
 
 import sys, os, signal
-sys.path.append('/usr/scripts/gestion')
-
 import time, commands
-from affich_tools import *
-from lock import *
-
-import config
 from tempfile import NamedTemporaryFile
+sys.path.append('/usr/scripts/gestion')
+if '/usr/scripts' not in sys.path:
+    sys.path.append('/usr/scripts')
+
+from gestion.affich_tools import *
+from gestion.lock import *
+from gestion import config
+
 
 class gen_config(object) :
     """ Base pour toutes les classes de génération de fichiers de conf """

gestion/gen_confs/generate.py

@@ -16,9 +16,12 @@ arguments peuvent être founis pour une même option, les séparer par &
 
 import sys, signal, os, getopt
 from trigger import trigger_generate as trigger
-sys.path.append('/usr/scripts/gestion')
 
-from ldap_crans import crans_ldap, hostname
+sys.path.append('/usr/scripts/gestion')
+if '/usr/scripts' not in sys.path:
+    sys.path.append('/usr/scripts')
+
+from gestion.ldap_crans import crans_ldap, hostname
 from lock import *
 from affich_tools import anim, cprint, OK
 from time import localtime, strftime, time, sleep

gestion/gest_crans_lc.py

@@ -23,7 +23,8 @@ import signal
 import inspect
 import tempfile
 import collections
-sys.path.append('/usr/scripts/')
+if '/usr/scripts' not in sys.path:
+    sys.path.append('/usr/scripts')
 from pythondialog import Dialog
 from pythondialog import DialogError, DialogTerminatedBySignal
 from OpenSSL import crypto, SSL

impression/digicode.py

@@ -26,14 +26,8 @@
  Copyright (c) 2006, 2007, 2008, 2009 by Cr@ns (http://www.crans.org)
 """
 import sys
-import time
-import tempfile
-import os
-import commands
-import string
-import random
 import requests
-if not '/usr/scripts' in sys.path:
+if '/usr/scripts' not in sys.path:
     sys.path.append("/usr/scripts")
 
 import gestion.secrets_new as secrets_new