From 10275229a1b395843b6adb191a259257142c4dbf Mon Sep 17 00:00:00 2001 From: Vincent Le Gallic Date: Wed, 8 May 2013 04:04:30 +0200 Subject: [PATCH] =?UTF-8?q?Dans=20la=20s=C3=A9rie=20suppression=20des=20li?= =?UTF-8?q?ens=20symboliques=20:=20/usr/scripts/lib=20devient=20/usr/scrip?= =?UTF-8?q?ts/cranslib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Comme ça c'est plus clair que c'est un truc custom crans * Le lien symbolique /usr/scripts/gestion/crans/ est retiré. D'autres suivront. --- archive/autologout.py | 4 ++-- archive/impression_old/impression_laserjet.py | 7 ++++--- {lib => cranslib}/__init__.py | 0 {lib => cranslib}/cp.py | 0 {lib => cranslib}/deprecated.py | 0 {lib => cranslib}/dialogwizard/__init__.py | 0 {lib => cranslib}/dialogwizard/dialog.py | 0 {lib => cranslib}/dialogwizard/dialogwizard.py | 0 {lib => cranslib}/dialogwizard/wizard.py | 0 {lib => cranslib}/gestion/__init__.py | 0 {lib => cranslib}/gestion/authentification.py | 0 {lib => cranslib}/gestion/fields.py | 0 {lib => cranslib}/gestion/models.py | 0 {lib => cranslib}/lib | 0 {lib => cranslib}/mail/__init__.py | 0 {lib => cranslib}/optparse_lenny.py | 0 {lib => cranslib}/scripts/__init__.py | 0 {lib => cranslib}/scripts/autologout.py | 4 ++-- {lib => cranslib}/scripts/helloworld.py | 3 +-- {lib => cranslib}/tv/__init__.py | 0 {lib => cranslib}/tv/channels.py | 0 {lib => cranslib}/utils/__init__.py | 0 {lib => cranslib}/utils/exceptions.py | 0 {lib => cranslib}/utils/files.py | 0 {lib => cranslib}/utils/logs.py | 0 {lib => cranslib}/utils/quota.py | 0 {lib => cranslib}/www/__init__.py | 0 {lib => cranslib}/www/pagesperso.py | 0 gestion/crans/__init__.py | 11 ----------- gestion/gen_confs/firewall_new.py | 5 +++-- gestion/gen_confs/switchs.py | 3 ++- impression/cout.py | 2 +- impression/digicode.py | 6 +++--- impression/impression_canon.py | 2 +- surveillance/fiche_deconnexion/generate.py | 2 +- 35 files changed, 20 insertions(+), 29 deletions(-) rename {lib => cranslib}/__init__.py (100%) rename {lib => cranslib}/cp.py (100%) rename {lib => cranslib}/deprecated.py (100%) rename {lib => cranslib}/dialogwizard/__init__.py (100%) rename {lib => cranslib}/dialogwizard/dialog.py (100%) rename {lib => cranslib}/dialogwizard/dialogwizard.py (100%) rename {lib => cranslib}/dialogwizard/wizard.py (100%) rename {lib => cranslib}/gestion/__init__.py (100%) rename {lib => cranslib}/gestion/authentification.py (100%) rename {lib => cranslib}/gestion/fields.py (100%) rename {lib => cranslib}/gestion/models.py (100%) rename {lib => cranslib}/lib (100%) rename {lib => cranslib}/mail/__init__.py (100%) rename {lib => cranslib}/optparse_lenny.py (100%) rename {lib => cranslib}/scripts/__init__.py (100%) rename {lib => cranslib}/scripts/autologout.py (93%) rename {lib => cranslib}/scripts/helloworld.py (71%) rename {lib => cranslib}/tv/__init__.py (100%) rename {lib => cranslib}/tv/channels.py (100%) rename {lib => cranslib}/utils/__init__.py (100%) rename {lib => cranslib}/utils/exceptions.py (100%) rename {lib => cranslib}/utils/files.py (100%) rename {lib => cranslib}/utils/logs.py (100%) rename {lib => cranslib}/utils/quota.py (100%) rename {lib => cranslib}/www/__init__.py (100%) rename {lib => cranslib}/www/pagesperso.py (100%) delete mode 100644 gestion/crans/__init__.py diff --git a/archive/autologout.py b/archive/autologout.py index bd6c07d0..559c5800 100755 --- a/archive/autologout.py +++ b/archive/autologout.py @@ -1,8 +1,8 @@ #! /usr/bin/env python import re, commands -import crans.utils.logs -log = crans.utils.logs.getFileLogger('autologout') +import cranslib.utils.logs +log = cranslib.utils.logs.getFileLogger('autologout') # pour chaque ligne du w for w in commands.getoutput("w -h").split('\n') : diff --git a/archive/impression_old/impression_laserjet.py b/archive/impression_old/impression_laserjet.py index a3283bb0..e8a08c71 100644 --- a/archive/impression_old/impression_laserjet.py +++ b/archive/impression_old/impression_laserjet.py @@ -32,11 +32,12 @@ __version__ = '1' import sys, syslog, os.path sys.path.append('/usr/scripts/gestion') +sys.path.append('/usr/scripts/') import config.impression import cout -from crans.utils import QuoteForPOSIX as escapeForShell -import crans.utils.logs -log = crans.utils.logs.getFileLogger('impression') +from cranslib.utils import QuoteForPOSIX as escapeForShell +import cranslib.utils.logs +log = cranslib.utils.logs.getFileLogger('impression') # Début : Ajout log pour réestimer les coûts import time import hptools diff --git a/lib/__init__.py b/cranslib/__init__.py similarity index 100% rename from lib/__init__.py rename to cranslib/__init__.py diff --git a/lib/cp.py b/cranslib/cp.py similarity index 100% rename from lib/cp.py rename to cranslib/cp.py diff --git a/lib/deprecated.py b/cranslib/deprecated.py similarity index 100% rename from lib/deprecated.py rename to cranslib/deprecated.py diff --git a/lib/dialogwizard/__init__.py b/cranslib/dialogwizard/__init__.py similarity index 100% rename from lib/dialogwizard/__init__.py rename to cranslib/dialogwizard/__init__.py diff --git a/lib/dialogwizard/dialog.py b/cranslib/dialogwizard/dialog.py similarity index 100% rename from lib/dialogwizard/dialog.py rename to cranslib/dialogwizard/dialog.py diff --git a/lib/dialogwizard/dialogwizard.py b/cranslib/dialogwizard/dialogwizard.py similarity index 100% rename from lib/dialogwizard/dialogwizard.py rename to cranslib/dialogwizard/dialogwizard.py diff --git a/lib/dialogwizard/wizard.py b/cranslib/dialogwizard/wizard.py similarity index 100% rename from lib/dialogwizard/wizard.py rename to cranslib/dialogwizard/wizard.py diff --git a/lib/gestion/__init__.py b/cranslib/gestion/__init__.py similarity index 100% rename from lib/gestion/__init__.py rename to cranslib/gestion/__init__.py diff --git a/lib/gestion/authentification.py b/cranslib/gestion/authentification.py similarity index 100% rename from lib/gestion/authentification.py rename to cranslib/gestion/authentification.py diff --git a/lib/gestion/fields.py b/cranslib/gestion/fields.py similarity index 100% rename from lib/gestion/fields.py rename to cranslib/gestion/fields.py diff --git a/lib/gestion/models.py b/cranslib/gestion/models.py similarity index 100% rename from lib/gestion/models.py rename to cranslib/gestion/models.py diff --git a/lib/lib b/cranslib/lib similarity index 100% rename from lib/lib rename to cranslib/lib diff --git a/lib/mail/__init__.py b/cranslib/mail/__init__.py similarity index 100% rename from lib/mail/__init__.py rename to cranslib/mail/__init__.py diff --git a/lib/optparse_lenny.py b/cranslib/optparse_lenny.py similarity index 100% rename from lib/optparse_lenny.py rename to cranslib/optparse_lenny.py diff --git a/lib/scripts/__init__.py b/cranslib/scripts/__init__.py similarity index 100% rename from lib/scripts/__init__.py rename to cranslib/scripts/__init__.py diff --git a/lib/scripts/autologout.py b/cranslib/scripts/autologout.py similarity index 93% rename from lib/scripts/autologout.py rename to cranslib/scripts/autologout.py index 47abe511..20cc65dd 100755 --- a/lib/scripts/autologout.py +++ b/cranslib/scripts/autologout.py @@ -4,10 +4,10 @@ import re import commands import sys sys.path.append('/usr/scripts/') -import lib.utils.logs +import cranslib.utils.logs import logging LOGGER = logging.getLogger("crans.autologout") -LOGGER.addHandler(lib.utils.logs.CransFileHandler("autologout")) +LOGGER.addHandler(cranslib.utils.logs.CransFileHandler("autologout")) LOGGER.setLevel(logging.WARNING) def run_autologout(): diff --git a/lib/scripts/helloworld.py b/cranslib/scripts/helloworld.py similarity index 71% rename from lib/scripts/helloworld.py rename to cranslib/scripts/helloworld.py index de9067f6..a64096fe 100644 --- a/lib/scripts/helloworld.py +++ b/cranslib/scripts/helloworld.py @@ -3,8 +3,7 @@ import logging import sys sys.path.append('/usr/scripts/') -from lib.utils.logs import getFileLogger -#LOGGER = logging.getLogger("crans.scripts.test") +from cranslib.utils.logs import getFileLogger LOGGER = getFileLogger("helloworld") LOGGER.setLevel(logging.INFO) LOGGER.addHandler(logging.StreamHandler()) diff --git a/lib/tv/__init__.py b/cranslib/tv/__init__.py similarity index 100% rename from lib/tv/__init__.py rename to cranslib/tv/__init__.py diff --git a/lib/tv/channels.py b/cranslib/tv/channels.py similarity index 100% rename from lib/tv/channels.py rename to cranslib/tv/channels.py diff --git a/lib/utils/__init__.py b/cranslib/utils/__init__.py similarity index 100% rename from lib/utils/__init__.py rename to cranslib/utils/__init__.py diff --git a/lib/utils/exceptions.py b/cranslib/utils/exceptions.py similarity index 100% rename from lib/utils/exceptions.py rename to cranslib/utils/exceptions.py diff --git a/lib/utils/files.py b/cranslib/utils/files.py similarity index 100% rename from lib/utils/files.py rename to cranslib/utils/files.py diff --git a/lib/utils/logs.py b/cranslib/utils/logs.py similarity index 100% rename from lib/utils/logs.py rename to cranslib/utils/logs.py diff --git a/lib/utils/quota.py b/cranslib/utils/quota.py similarity index 100% rename from lib/utils/quota.py rename to cranslib/utils/quota.py diff --git a/lib/www/__init__.py b/cranslib/www/__init__.py similarity index 100% rename from lib/www/__init__.py rename to cranslib/www/__init__.py diff --git a/lib/www/pagesperso.py b/cranslib/www/pagesperso.py similarity index 100% rename from lib/www/pagesperso.py rename to cranslib/www/pagesperso.py diff --git a/gestion/crans/__init__.py b/gestion/crans/__init__.py deleted file mode 100644 index 61968824..00000000 --- a/gestion/crans/__init__.py +++ /dev/null @@ -1,11 +0,0 @@ -# -*- coding:utf-8 -*- - - -import sys -sys.path.append('/usr/scripts/') - -from lib import * - -# En vrai, ce truc est deprecated -import lib.deprecated -lib.deprecated.module() diff --git a/gestion/gen_confs/firewall_new.py b/gestion/gen_confs/firewall_new.py index 879d8e38..5bd3b6df 100755 --- a/gestion/gen_confs/firewall_new.py +++ b/gestion/gen_confs/firewall_new.py @@ -25,11 +25,12 @@ # PURPOSE. import sys +sys.path.append('/usr/scripts/') sys.path.append('/usr/scripts/gestion') sys.path.append('/usr/scripts/lc_ldap') -import crans.deprecated -crans.deprecated.module() +import cranslib.deprecated +cranslib.deprecated.module() import syslog import pwd diff --git a/gestion/gen_confs/switchs.py b/gestion/gen_confs/switchs.py index e1402b25..ebda5715 100755 --- a/gestion/gen_confs/switchs.py +++ b/gestion/gen_confs/switchs.py @@ -17,6 +17,7 @@ import sys, os, commands, smtplib, tempfile, getopt os.umask(0117) +sys.path.append('/usr/scripts/') sys.path.append('/usr/scripts/gestion') from hptools import hpswitch, sw_chbre from ldap_crans import crans_ldap, BorneWifi @@ -26,7 +27,7 @@ from gen_confs import * import datetime import config import re -from crans.deprecated import deprecated +from cranslib.deprecated import deprecated capture_model = re.compile(r'\((.*)\)') headers_by_model = { diff --git a/impression/cout.py b/impression/cout.py index 785a44b0..664083ab 100644 --- a/impression/cout.py +++ b/impression/cout.py @@ -39,7 +39,7 @@ import shutil import syslog import stat sys.path.append('/usr/scripts/') -from lib.utils import QuoteForPOSIX as escapeForShell +from cranslib.utils import QuoteForPOSIX as escapeForShell def __init__(): pass diff --git a/impression/digicode.py b/impression/digicode.py index 0f5987b3..80960cc9 100644 --- a/impression/digicode.py +++ b/impression/digicode.py @@ -33,7 +33,7 @@ import commands import string import random sys.path.append("/usr/scripts/") -import lib.utils.files +import cranslib.utils.files # ############################################################# # CONSTANTES # ############################################################# @@ -132,7 +132,7 @@ def list_code(): files = os.listdir(CODES_DIR) code_list = [] for aCode in files: - age = lib.utils.files.ageOfFile(os.path.join(CODES_DIR, aCode ) ) + age = cranslib.utils.files.ageOfFile(os.path.join(CODES_DIR, aCode ) ) content = read_code_file(aCode) code_list.append((aCode, age, content ) ) return code_list @@ -161,5 +161,5 @@ def menage(): for aFile in fileList: aFilePath = os.path.join(CODES_DIR, aFile) if os.path.isfile(aFilePath): - if lib.utils.files.fileIsOlderThan(aFilePath, days=1): + if cranslib.utils.files.fileIsOlderThan(aFilePath, days=1): os.remove(aFilePath) diff --git a/impression/impression_canon.py b/impression/impression_canon.py index d8cd9be7..19037497 100644 --- a/impression/impression_canon.py +++ b/impression/impression_canon.py @@ -35,7 +35,7 @@ sys.path.append('/usr/scripts/gestion') from config import impression as config_impression from commands import getstatusoutput sys.path.append('/usr/scripts/') -from lib.utils import logs +from cranslib.utils import logs from subprocess import Popen, PIPE # ######################################################## # diff --git a/surveillance/fiche_deconnexion/generate.py b/surveillance/fiche_deconnexion/generate.py index 9bc47030..39ccaf7e 100755 --- a/surveillance/fiche_deconnexion/generate.py +++ b/surveillance/fiche_deconnexion/generate.py @@ -30,7 +30,7 @@ def log(x): syslog.syslog(x) syslog.closelog() -from lib.utils import exceptions +from cranslib.utils import exceptions import locale locale.setlocale(locale.LC_TIME, 'fr_FR.utf8')