From 31bb37674198fe67dec5f07eda7ccf7fce5d9b95 Mon Sep 17 00:00:00 2001
From: Vincent Le Gallic <legallic@crans.org>
Date: Tue, 7 May 2013 21:34:09 +0200
Subject: [PATCH] Correction des import crans.utils partout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ça semble provoquer des erreurs d'import, donc autant tout corriger
---
 impression/cout.py             | 14 ++++++++++----
 impression/impression_canon.py |  5 +++--
 lib/scripts/autologout.py      | 14 +++++++-------
 lib/scripts/helloworld.py      |  4 +++-
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/impression/cout.py b/impression/cout.py
index 5f4ed945..785a44b0 100644
--- a/impression/cout.py
+++ b/impression/cout.py
@@ -31,9 +31,15 @@
 # Début : Ajout log pour réestimer les coûts
 import time
 # Fin 
-import sys, tempfile, os, commands, shutil, syslog, stat
-sys.path.append('/usr/scripts/gestion')
-from crans.utils import QuoteForPOSIX as escapeForShell
+import sys
+import tempfile
+import os
+import commands
+import shutil
+import syslog
+import stat
+sys.path.append('/usr/scripts/')
+from lib.utils import QuoteForPOSIX as escapeForShell
 def __init__():
     pass
 
@@ -42,7 +48,7 @@ def __init__():
 # ########################################################### #
 #
 #
-import config.impression
+from gestion import config.impression
 COUT_UNITE_COULEUR = config.impression.c_coul
 COUT_UNITE_NOIRE = config.impression.c_noir
 COUT_PASSAGE_TAMBOUR_NOIR = config.impression.c_tambour_noir
diff --git a/impression/impression_canon.py b/impression/impression_canon.py
index 5a1a15c4..d8cd9be7 100644
--- a/impression/impression_canon.py
+++ b/impression/impression_canon.py
@@ -34,7 +34,8 @@ import sys, os.path
 sys.path.append('/usr/scripts/gestion')
 from config import impression as config_impression
 from commands import getstatusoutput
-import crans.utils.logs
+sys.path.append('/usr/scripts/')
+from lib.utils import logs
 from subprocess import Popen, PIPE
 
 # ######################################################## #
@@ -188,7 +189,7 @@ class impression:
         """
 
         # On ouvre les logs
-        self.log = crans.utils.logs.getFileLogger('impression')
+        self.log = logs.getFileLogger('impression')
 
         self._fichier = path_to_pdf
         self._adh = adh
diff --git a/lib/scripts/autologout.py b/lib/scripts/autologout.py
index a3999f9b..47abe511 100755
--- a/lib/scripts/autologout.py
+++ b/lib/scripts/autologout.py
@@ -1,10 +1,13 @@
 #! /usr/bin/env python
 
-import re, commands
-import crans.utils.logs
+import re
+import commands
+import sys
+sys.path.append('/usr/scripts/')
+import lib.utils.logs
 import logging
 LOGGER = logging.getLogger("crans.autologout")
-LOGGER.addHandler(crans.utils.logs.CransFileHandler("autologout"))
+LOGGER.addHandler(lib.utils.logs.CransFileHandler("autologout"))
 LOGGER.setLevel(logging.WARNING)
 
 def run_autologout():
@@ -15,11 +18,8 @@ def run_autologout():
         # on splite
         w = w.split()
         
-        if w[0] in ['cohen','segaud']:
-            continue
-        
         # on verifie que c'est une connection du bde
-        hosts = ['bde.crans.org','cableur.crans.org','cableuse.crans.org','venus.crans.org']
+        hosts = ['cableur.crans.org','cableuse.crans.org','venus.crans.org','kfet.crans.org']
         if w[2] not in [ h[0:16] for h in hosts ] :
             continue
         
diff --git a/lib/scripts/helloworld.py b/lib/scripts/helloworld.py
index 843d21c9..de9067f6 100644
--- a/lib/scripts/helloworld.py
+++ b/lib/scripts/helloworld.py
@@ -1,7 +1,9 @@
 
 import logging
 
-from crans.utils.logs import getFileLogger
+import sys
+sys.path.append('/usr/scripts/')
+from lib.utils.logs import getFileLogger
 #LOGGER = logging.getLogger("crans.scripts.test")
 LOGGER = getFileLogger("helloworld")
 LOGGER.setLevel(logging.INFO)