diff options
author | Stan Seibert <stan@mtrr.org> | 2011-09-20 10:28:45 -0400 |
---|---|---|
committer | Stan Seibert <stan@mtrr.org> | 2011-09-20 10:28:45 -0400 |
commit | 0736d51bf19aead11332e31bc1172d7de4d3d9f3 (patch) | |
tree | 2a371d04e61cbae0ea4ab31215d4be4ce814c0af /bin | |
parent | 85c94f5d0127256fb79afcea8600011a421af603 (diff) | |
download | chroma-0736d51bf19aead11332e31bc1172d7de4d3d9f3.tar.gz chroma-0736d51bf19aead11332e31bc1172d7de4d3d9f3.tar.bz2 chroma-0736d51bf19aead11332e31bc1172d7de4d3d9f3.zip |
Change module import method to allow loading a detector from multi-level module name, like chroma.detectors.cad_sno.
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/chroma-cam | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/bin/chroma-cam b/bin/chroma-cam index 8465aaa..6e52387 100755 --- a/bin/chroma-cam +++ b/bin/chroma-cam @@ -4,7 +4,6 @@ if __name__ == '__main__': import optparse import sys - import imp import os from chroma import view, build, EventViewer @@ -24,16 +23,14 @@ if __name__ == '__main__': if os.path.exists(args[0]) and args[0].lower().endswith(('.stl', '.bz2')): obj = mesh_from_stl(args[0]) else: - name, attr = args[0].split('.') + module_name, function_name = args[0].rsplit('.', 1) try: - file, path, description = imp.find_module(name) + module = __import__(module_name, fromlist=[function_name]) except ImportError: raise - module = imp.load_module(name, file, path, description) - - obj = getattr(module, attr) + obj = getattr(module, function_name) if options.io_file is None: view(obj, size) |