From 016f0488b1f2ebf1596cf4078e8a88a64feef78e Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Mon, 12 Oct 2015 23:21:31 +0200 Subject: [PATCH] prepend paths and better naming --- update.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/update.py b/update.py index 739e8aa..3d42a00 100644 --- a/update.py +++ b/update.py @@ -138,9 +138,9 @@ def gen_setup(config, relative_path, setup_script_name): s.append('\nimport os') s.append('import sys') - s.append("\nsys.path.append('%s')" % relative_path) - s.append("sys.path.append('%s')" % os.path.join(relative_path, 'lib')) - s.append("sys.path.append('%s')" % os.path.join(relative_path, 'lib', 'docopt')) + s.append("\nsys.path.insert(0, '{0}')".format(relative_path)) + s.append("sys.path.insert(0, '{0}')".format(os.path.join(relative_path, 'lib'))) + s.append("sys.path.insert(0, '{0}')".format(os.path.join(relative_path, 'lib', 'docopt'))) s.append('import config') s.append('import docopt') @@ -182,10 +182,10 @@ def gen_setup(config, relative_path, setup_script_name): s.append(" sys.stderr.write(options)") s.append(" sys.exit(-1)") s.append("\n") - s.append("# we run the arguments through the validate_setup_args function if it exists") - s.append("if config.module_exists('validate'):") - s.append(" import validate") - s.append(" arguments = validate.validate_setup_args(sys.argv, arguments)") + s.append("# use extensions to validate/post-process args") + s.append("if config.module_exists('extensions'):") + s.append(" import extensions") + s.append(" arguments = extensions.postprocess_args(sys.argv, arguments)") s.append("\n") s.append("root_directory = os.path.dirname(os.path.realpath(__file__))") s.append("\n")