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.
Reviewed-by: Matt Turner <mattst88@gmail.com>
import pdb
import os.path
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 <catalyst@gentoo.org>"
__version__="2.0.14"
__maintainer__="Catalyst <catalyst@gentoo.org>"
__version__="2.0.14"
# now, try and parse the config file "config_file"
try:
# execfile(config_file, myconf, myconf)
# 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:
myconf.update(myconfig.get_values())
except:
- catalyst.util.print_traceback()
+ modules.catalyst.util.print_traceback()
print "!!! catalyst: Error encountered during run of target " + addlargs["target"]
sys.exit(1)
print "!!! catalyst: Error encountered during run of target " + addlargs["target"]
sys.exit(1)
addlargs={}
if myspecfile:
addlargs={}
if myspecfile:
- spec = catalyst.config.SpecParser(myspecfile)
+ spec = modules.catalyst.config.SpecParser(myspecfile)
addlargs.update(spec.get_values())
if mycmdline:
try:
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:
cmdline.parse_lines(mycmdline)
addlargs.update(cmdline.get_values())
except CatalystError:
-from catalyst_support import *
+from modules.catalyst_support import *