diff options
author | Tom Rondeau | 2012-10-19 22:24:06 -0400 |
---|---|---|
committer | Tom Rondeau | 2012-10-19 22:24:06 -0400 |
commit | 1137126abd72593db6bc563d4c7dab00ba47e888 (patch) | |
tree | fd089aa1ebbe8c47f36f49213c6bf91908b3edfa /gr-howto-write-a-block/python/__init__.py | |
parent | 0b62e85e4c57796098c4ecf367c8aa16a120e791 (diff) | |
download | gnuradio-1137126abd72593db6bc563d4c7dab00ba47e888.tar.gz gnuradio-1137126abd72593db6bc563d4c7dab00ba47e888.tar.bz2 gnuradio-1137126abd72593db6bc563d4c7dab00ba47e888.zip |
Removes some swig workaround code put in for ticket 181.
This seems to fix the import problems recently seen on 12.10 for loading gnuradio-companion (due to 'from lxml import etree' which was actually due to 'import os' causing a segfault).
Diffstat (limited to 'gr-howto-write-a-block/python/__init__.py')
-rw-r--r-- | gr-howto-write-a-block/python/__init__.py | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/gr-howto-write-a-block/python/__init__.py b/gr-howto-write-a-block/python/__init__.py index 575cbfc22..2bd27cb31 100644 --- a/gr-howto-write-a-block/python/__init__.py +++ b/gr-howto-write-a-block/python/__init__.py @@ -23,32 +23,8 @@ This is the GNU Radio HOWTO module. Place your Python package description here (python/__init__.py). ''' -# ---------------------------------------------------------------- -# Temporary workaround for ticket:181 (swig+python problem) -import sys -_RTLD_GLOBAL = 0 -try: - from dl import RTLD_GLOBAL as _RTLD_GLOBAL -except ImportError: - try: - from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL - except ImportError: - pass - -if _RTLD_GLOBAL != 0: - _dlopenflags = sys.getdlopenflags() - sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL) -# ---------------------------------------------------------------- - - # import swig generated symbols into the howto namespace from howto_swig import * # import any pure python here # - -# ---------------------------------------------------------------- -# Tail of workaround -if _RTLD_GLOBAL != 0: - sys.setdlopenflags(_dlopenflags) # Restore original flags -# ---------------------------------------------------------------- |