From 21c427ff9b5d151401d297e1b434fa5833539bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Wed, 15 Oct 2014 00:08:53 +0200
Subject: [PATCH] Meilleure gestion de sys.path et des imports.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 * Ajout de /usr/scripts aux paths
 * Déplacement de templates.py dans un endroit logique pour printing
---
 crans_utils.py                        | 6 ++++--
 printing/__init__.py                  | 2 +-
 printing/templates/__init__.py        | 0
 printing/{ => templates}/templates.py | 0
 services.py                           | 3 +--
 5 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 printing/templates/__init__.py
 rename printing/{ => templates}/templates.py (100%)

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