diff --git a/bcfg2/bcfg2_report.py b/bcfg2/bcfg2_report.py index 3cdc4c3a..0c91404d 100755 --- a/bcfg2/bcfg2_report.py +++ b/bcfg2/bcfg2_report.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/bin/bash /usr/scripts/python.sh # -*- coding: utf-8 -*- """ Envoie un mail avec la liste des serveurs qui ne sont pas synchro avec bcfg2. @@ -43,7 +43,6 @@ if __name__ == "__main__": debug = "--debug" in sys.argv if "--mail" in sys.argv: if hosts != "": - sys.path.append("/usr/scripts/") import utils.sendmail utils.sendmail.sendmail("root@crans.org", "roots@crans.org", u"Serveurs non synchronisés avec bcfg2", hosts, more_headers={"X-Mailer" : "bcfg2-reports"}, debug=debug) elif debug: diff --git a/gestion/gen_confs/firewall4/utils.py b/gestion/gen_confs/firewall4/utils.py index fd8e756b..e7f0d007 100644 --- a/gestion/gen_confs/firewall4/utils.py +++ b/gestion/gen_confs/firewall4/utils.py @@ -1,11 +1,10 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- import os import sys import netaddr -if '/usr/scripts/' not in sys.path: - sys.path.append('/usr/scripts/') +if '/usr/scripts' not in sys.path: + sys.path.append('/usr/scripts') import syslog import subprocess diff --git a/impression/cout.py b/impression/cout.py index bcd67205..54c1d009 100644 --- a/impression/cout.py +++ b/impression/cout.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/bin/bash /usr/scripts/python.sh # -*- coding: utf-8 -*- # ############################################################# # .. @@ -38,7 +38,8 @@ import commands import shutil import syslog import stat -sys.path.append('/usr/scripts/') +if '/usr/scripts' not in sys.path: + sys.path.append('/usr/scripts') from cranslib.deprecated import module as deprecated_module deprecated_module() from cranslib.utils import QuoteForPOSIX as escapeForShell diff --git a/impression/impression_canon.py b/impression/impression_canon.py index cd870bc8..d7d66cda 100644 --- a/impression/impression_canon.py +++ b/impression/impression_canon.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # ############################################################# # .. @@ -31,10 +30,11 @@ Calcule le coût des options d'impression. __version__ = '9.11' import sys, os.path -sys.path.append('/usr/scripts/gestion') -from config import impression as config_impression +from gestion.config import impression as config_impression from commands import getstatusoutput -sys.path.append('/usr/scripts/') + +if '/usr/scripts' not in sys.path: + sys.path.append('/usr/scripts') from cranslib.utils import logs from subprocess import Popen, PIPE from base import FichierInvalide, SoldeInsuffisant, PrintError, SettingsError @@ -415,9 +415,7 @@ class impression: def _get_adh(self, adh): if type(adh) == str: - sys.path.append("/usr/scripts/gestion/") - #from ldap_crans_test import crans_ldap - from ldap_crans import CransLdap + from gestion.ldap_crans import CransLdap adh = CransLdap().getProprio(adh, 'w') return adh diff --git a/sip/asterisk.py b/sip/asterisk.py index 951e1f0f..981383cb 100644 --- a/sip/asterisk.py +++ b/sip/asterisk.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 - # liste d'event http://www.voip-info.org/wiki/view/asterisk+manager+events # liste d'action http://www.voip-info.org/wiki/view/Asterisk+manager+API @@ -16,7 +15,8 @@ import threading import psycopg2.extras from datetime import datetime -sys.path.append('/usr/scripts/') +if '/usr/scripts' not in sys.path: + sys.path.append('/usr/scripts') import lc_ldap.shortcuts import lc_ldap.objets diff --git a/sip/sip_multidial.py b/sip/sip_multidial.py index 6bab0e78..a4d492bb 100755 --- a/sip/sip_multidial.py +++ b/sip/sip_multidial.py @@ -1,15 +1,11 @@ -#!/usr/bin/env python +#!/bin/bash /usr/scripts/python.sh # -*- coding: utf-8 -*- import sys,os,hashlib -# The fuck is happening here ? -sys.path.append('/usr/scripts/gestion') -sys.path.append('/usr/scripts/') import lc_ldap.shortcuts from asterisk_reload_conf import reload_config -conn=lc_ldap.shortcuts.lc_ldap_admin() def gen_multidial(name, entensions): dial=""" @@ -24,6 +20,7 @@ exten => %(name)s,n,Hangup() return dial if __name__ == '__main__' : + conn=lc_ldap.shortcuts.lc_ldap_admin() multidial="" for droit in ['nounou', 'bureau', 'cableur', 'imprimeur']: multidial+=gen_multidial(droit, (adh['aid'][0].value for adh in conn.search(u'(&(droits=%s)(!(chbre=EXT)))' % droit))) diff --git a/surveillance/mac_prises/mac_prise_analyzer.py b/surveillance/mac_prises/mac_prise_analyzer.py index e74cc483..6273aef2 100755 --- a/surveillance/mac_prises/mac_prise_analyzer.py +++ b/surveillance/mac_prises/mac_prise_analyzer.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/bin/bash /usr/scripts/python.sh # -*- coding: utf8 -*- # # Sclaimer @@ -12,10 +12,11 @@ import sys import smtplib import time -sys.path.append('/usr/scripts/gestion') -from config import mac_prise -from affich_tools import tableau -sys.path.append('/usr/scripts/') +if '/usr/scripts' not in sys.path: + sys.path.append('/usr/scripts') + +from gestion.config import mac_prise +from gestion.affich_tools import tableau import lc_ldap.shortcuts import lc_ldap.objets import collections diff --git a/wiki/macro/TV.py b/wiki/macro/TV.py index 80d64638..1056b779 100644 --- a/wiki/macro/TV.py +++ b/wiki/macro/TV.py @@ -1,7 +1,7 @@ import sys -sys.path.append('/usr/scripts/') +if '/usr/scripts' not in sys.path: + sys.path.append('/usr/scripts') import tv.dns -sys.path.pop() Dependencies = ["Time"]