/usr/scripts sans / final
This commit is contained in:
parent
650f55e7e8
commit
ebeab8a0a0
8 changed files with 23 additions and 28 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue