| 1 |
commit: 1762a4c10f5e30cc98a32ef45a07f35b87257b55 |
| 2 |
Author: Dylan Baker <baker.dylan.c <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Oct 13 09:07:36 2013 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 26 17:22:39 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=1762a4c1 |
| 7 |
|
| 8 |
catalyst: use a more pythonic method to import modules |
| 9 |
|
| 10 |
Rather than appending a directory to the system path, this patch adds a |
| 11 |
__init__.py file to modules, which allows python to search it, and it's |
| 12 |
children for python modules. This also requires changes to a few of the |
| 13 |
module files to make them happy. |
| 14 |
|
| 15 |
Reviewed-by: Matt Turner <mattst88 <AT> gmail.com> |
| 16 |
|
| 17 |
--- |
| 18 |
catalyst | 16 ++++++---------- |
| 19 |
modules/__init__.py | 0 |
| 20 |
modules/catalyst/config.py | 2 +- |
| 21 |
3 files changed, 7 insertions(+), 11 deletions(-) |
| 22 |
|
| 23 |
diff --git a/catalyst b/catalyst |
| 24 |
index 11560fb..2378a87 100755 |
| 25 |
--- a/catalyst |
| 26 |
+++ b/catalyst |
| 27 |
@@ -11,12 +11,8 @@ import os, sys, imp, string, getopt |
| 28 |
import pdb |
| 29 |
import os.path |
| 30 |
|
| 31 |
-__selfpath__ = os.path.abspath(os.path.dirname(__file__)) |
| 32 |
- |
| 33 |
-sys.path.append(__selfpath__ + "/modules") |
| 34 |
- |
| 35 |
-import catalyst.config |
| 36 |
-import catalyst.util |
| 37 |
+import modules.catalyst.config |
| 38 |
+import modules.catalyst.util |
| 39 |
|
| 40 |
__maintainer__="Catalyst <catalyst@g.o>" |
| 41 |
__version__="2.0.14" |
| 42 |
@@ -91,7 +87,7 @@ def parse_config(myconfig): |
| 43 |
# now, try and parse the config file "config_file" |
| 44 |
try: |
| 45 |
# execfile(config_file, myconf, myconf) |
| 46 |
- myconfig = catalyst.config.ConfigParser(config_file) |
| 47 |
+ myconfig = modules.catalyst.config.ConfigParser(config_file) |
| 48 |
myconf.update(myconfig.get_values()) |
| 49 |
|
| 50 |
except: |
| 51 |
@@ -226,7 +222,7 @@ def build_target(addlargs, targetmap): |
| 52 |
mytarget.run() |
| 53 |
|
| 54 |
except: |
| 55 |
- catalyst.util.print_traceback() |
| 56 |
+ modules.catalyst.util.print_traceback() |
| 57 |
print "!!! catalyst: Error encountered during run of target " + addlargs["target"] |
| 58 |
sys.exit(1) |
| 59 |
|
| 60 |
@@ -379,12 +375,12 @@ if __name__ == "__main__": |
| 61 |
addlargs={} |
| 62 |
|
| 63 |
if myspecfile: |
| 64 |
- spec = catalyst.config.SpecParser(myspecfile) |
| 65 |
+ spec = modules.catalyst.config.SpecParser(myspecfile) |
| 66 |
addlargs.update(spec.get_values()) |
| 67 |
|
| 68 |
if mycmdline: |
| 69 |
try: |
| 70 |
- cmdline = catalyst.config.ConfigParser() |
| 71 |
+ cmdline = modules.catalyst.config.ConfigParser() |
| 72 |
cmdline.parse_lines(mycmdline) |
| 73 |
addlargs.update(cmdline.get_values()) |
| 74 |
except CatalystError: |
| 75 |
|
| 76 |
diff --git a/modules/__init__.py b/modules/__init__.py |
| 77 |
new file mode 100644 |
| 78 |
index 0000000..e69de29 |
| 79 |
|
| 80 |
diff --git a/modules/catalyst/config.py b/modules/catalyst/config.py |
| 81 |
index 00da343..726bf74 100644 |
| 82 |
--- a/modules/catalyst/config.py |
| 83 |
+++ b/modules/catalyst/config.py |
| 84 |
@@ -1,5 +1,5 @@ |
| 85 |
import re |
| 86 |
-from catalyst_support import * |
| 87 |
+from modules.catalyst_support import * |
| 88 |
|
| 89 |
class ParserBase: |
Archives