summaryrefslogtreecommitdiff
path: root/grc
diff options
context:
space:
mode:
authorTom Rondeau2013-02-18 16:05:09 -0500
committerTom Rondeau2013-02-18 16:05:09 -0500
commitf1ae6c5c801c4dd6e4ad05790aa1d9567f4533da (patch)
tree2e9a509193835cfe6b7475ee616352db07bb179c /grc
parent06020bae05f856376b91f2f6aacb980a3eae1218 (diff)
parentd2e8ec96084a26127907fe1cee2f15871d67b60d (diff)
downloadgnuradio-f1ae6c5c801c4dd6e4ad05790aa1d9567f4533da.tar.gz
gnuradio-f1ae6c5c801c4dd6e4ad05790aa1d9567f4533da.tar.bz2
gnuradio-f1ae6c5c801c4dd6e4ad05790aa1d9567f4533da.zip
Merge branch 'maint'
Diffstat (limited to 'grc')
-rw-r--r--grc/python/extract_docs.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/grc/python/extract_docs.py b/grc/python/extract_docs.py
index a7e945c37..33c404362 100644
--- a/grc/python/extract_docs.py
+++ b/grc/python/extract_docs.py
@@ -31,7 +31,13 @@ def _extract(key):
module_name, constructor_name = key.split('_', 1)
module = __import__('gnuradio.'+module_name)
module = getattr(module, module_name)
- except: return ''
+ except ImportError:
+ try:
+ module_name, constructor_name = key.split('_', 1)
+ module = __import__(module_name)
+ except: return ''
+ except:
+ return ''
pattern = constructor_name.replace('_', '_*').replace('x', '\w')
pattern_matcher = re.compile('^%s\w*$'%pattern)
matches = filter(lambda x: pattern_matcher.match(x), dir(module))