diff --git a/crans_utils.py b/crans_utils.py index 12e1409..bfdf951 100644 --- a/crans_utils.py +++ b/crans_utils.py @@ -41,8 +41,10 @@ import base64 import collections import hashlib import ldap.filter -sys.path.append('/usr/scripts/gestion') -import config + +if '/usr/scripts' not in sys.path: + sys.path.append('/usr/scripts') +from gestion import config from unicodedata import normalize import subprocess from netifaces import interfaces, ifaddresses, AF_INET diff --git a/printing/__init__.py b/printing/__init__.py index b8f32d6..f290530 100644 --- a/printing/__init__.py +++ b/printing/__init__.py @@ -1 +1 @@ -from templates import * +from templates.templates import * diff --git a/printing/templates/__init__.py b/printing/templates/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/printing/templates.py b/printing/templates/templates.py similarity index 100% rename from printing/templates.py rename to printing/templates/templates.py diff --git a/services.py b/services.py index b07e7af..b9f1e77 100644 --- a/services.py +++ b/services.py @@ -7,11 +7,10 @@ import lc_ldap import attributs import objets import variables -import config -from gen_confs.dhcpd_new import dydhcp import sys if not '/usr/scripts' in sys.path: sys.path.append('/usr/scripts') +from gestion.gen_confs.dhcpd_new import dydhcp import gestion.config as config # liste des attributs dont dépend un service