Rather than appending a directory to the system path, this patch adds a __init__.py file to modules, which allows python to search it, and it's children for python modules. This also requires changes to a few of the module files to make them happy. --- catalyst | 16 ++++++---------- modules/__init__.py | 0 modules/catalyst/config.py | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) create mode 100644 modules/__init__.py
diff --git a/catalyst b/catalyst index 11560fb..2378a87 100755 --- a/catalyst +++ b/catalyst @@ -11,12 +11,8 @@ import os, sys, imp, string, getopt import pdb import os.path -__selfpath__ = os.path.abspath(os.path.dirname(__file__)) - -sys.path.append(__selfpath__ + "/modules") - -import catalyst.config -import catalyst.util +import modules.catalyst.config +import modules.catalyst.util __maintainer__="Catalyst <[email protected]>" __version__="2.0.14" @@ -91,7 +87,7 @@ def parse_config(myconfig): # now, try and parse the config file "config_file" try: # execfile(config_file, myconf, myconf) - myconfig = catalyst.config.ConfigParser(config_file) + myconfig = modules.catalyst.config.ConfigParser(config_file) myconf.update(myconfig.get_values()) except: @@ -226,7 +222,7 @@ def build_target(addlargs, targetmap): mytarget.run() except: - catalyst.util.print_traceback() + modules.catalyst.util.print_traceback() print "!!! catalyst: Error encountered during run of target " + addlargs["target"] sys.exit(1) @@ -379,12 +375,12 @@ if __name__ == "__main__": addlargs={} if myspecfile: - spec = catalyst.config.SpecParser(myspecfile) + spec = modules.catalyst.config.SpecParser(myspecfile) addlargs.update(spec.get_values()) if mycmdline: try: - cmdline = catalyst.config.ConfigParser() + cmdline = modules.catalyst.config.ConfigParser() cmdline.parse_lines(mycmdline) addlargs.update(cmdline.get_values()) except CatalystError: diff --git a/modules/__init__.py b/modules/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/modules/catalyst/config.py b/modules/catalyst/config.py index 00da343..726bf74 100644 --- a/modules/catalyst/config.py +++ b/modules/catalyst/config.py @@ -1,5 +1,5 @@ import re -from catalyst_support import * +from modules.catalyst_support import * class ParserBase: -- 1.8.1.5
