diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-05-16 15:56:59 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-05-16 15:56:59 -0700 |
| commit | 1274197aaa56f3ba4b11adb9f33e26054e6a770f (patch) | |
| tree | 8507829b32f1f5f142b7e49afd1f80754500f427 /gr-utils/python/modtool/gr-newmod | |
| parent | 5974a3e57cc6874d55d19dcb02ac9d8161753ea1 (diff) | |
| parent | 7ff241e0bc2d8a9c6e04af225d3ed74e5a9c762c (diff) | |
Merge branch 'maint'
Conflicts:
gr-filter/python/filter/qa_pfb_channelizer.py
Diffstat (limited to 'gr-utils/python/modtool/gr-newmod')
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/python/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gr-utils/python/modtool/gr-newmod/python/__init__.py b/gr-utils/python/modtool/gr-newmod/python/__init__.py index 575cbfc222..d852fda545 100644 --- a/gr-utils/python/modtool/gr-newmod/python/__init__.py +++ b/gr-utils/python/modtool/gr-newmod/python/__init__.py @@ -42,7 +42,11 @@ if _RTLD_GLOBAL != 0: # import swig generated symbols into the howto namespace -from howto_swig import * +try: + # this might fail if the module is python-only + from howto_swig import * +except ImportError: + pass # import any pure python here # |