From f37a7bc698cbd1fd6ba6f4ef10e7b1c074302c82 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Fri, 13 Apr 2012 08:37:48 +0200 Subject: [PATCH] cleanup --- waflib/extras/run_m_script.py | 2 +- waflib/extras/run_py_script.py | 9 +++------ waflib/extras/run_r_script.py | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/waflib/extras/run_m_script.py b/waflib/extras/run_m_script.py index 0452323c..ad8cb1d2 100644 --- a/waflib/extras/run_m_script.py +++ b/waflib/extras/run_m_script.py @@ -20,7 +20,7 @@ Usage:: deps='some_data.mat') """ -import os, re, sys +import os, sys from waflib import Task, TaskGen, Logs MATLAB_COMMANDS = ['matlab'] diff --git a/waflib/extras/run_py_script.py b/waflib/extras/run_py_script.py index 3c8230db..ca50042d 100644 --- a/waflib/extras/run_py_script.py +++ b/waflib/extras/run_py_script.py @@ -26,17 +26,14 @@ import os, re from waflib import Task, TaskGen, Logs -def configure(ctx): - """TODO: Needs updating for Windows once +def configure(conf): + """TODO: Might need to be updated for Windows once "PEP 397":http://www.python.org/dev/peps/pep-0397/ is settled. - """ - # Counter how many Python interpreters are found - cnt = 0 conf.find_program('python', var='PY2CMD', mandatory=False) conf.find_program('python3', var='PY3CMD', mandatory=False) if not conf.env.PY2CMD and not conf.env.PY3CMD: - ctx.fatal("No Python interpreter found!") + conf.fatal("No Python interpreter found!") @Task.update_outputs class run_py_2_script(Task.Task): diff --git a/waflib/extras/run_r_script.py b/waflib/extras/run_r_script.py index b120efc1..cc7f979c 100644 --- a/waflib/extras/run_r_script.py +++ b/waflib/extras/run_r_script.py @@ -18,7 +18,7 @@ Usage:: """ -import os, re, sys +import os, sys from waflib import Task, TaskGen, Logs R_COMMANDS = ['RTerm', 'R', 'r']