crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mise à jour du plugin

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-05-18 23:28:19 +02:00
parent 8cc8770ee4
commit d23bda8bd2
2 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
bcfg2new/Plugins/Python/PythonFile.py
View file

@ -122,13 +122,6 @@ class PythonFile(Debuggable):
if environment is None:
environment = PythonEnv.SafeEnvironment(additionnal, self)
# On ne réaffecte stdout que sur le premier élément de la pile
have_to_get_out = False
if sys.stdout == sys.__stdout__:
sys.stdout = environment.stream
have_to_get_out = True
# Lors de l'exécution d'un fichier, on inclut
# toujours common (ie on l'exécute dans l'environnement)
environment.include("common")
@ -137,12 +130,8 @@ class PythonFile(Debuggable):
exec(self.data, environment)
except Exception:
sys.stderr.write('code: %r\n' % (self.data,))
sys.stdout = sys.__stdout__
raise
if sys.stdout != sys.__stdout__ and have_to_get_out:
sys.stdout = sys.__stdout__
have_to_get_out = False
return environment.stream.getvalue(), environment['info']
#+---------------------------------------------+
@ -192,7 +181,7 @@ def compileSource(source, filename="", logger=None):
newsource.write(line)
# Et un superbe \n.
newsource.write('\\n")')
newsource.write('")')
# %, affectation.
elif linetype == "%":