diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-05 22:50:46 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-05 22:50:46 -0500 |
| commit | a99beca4b60869f7d8ae1743ba4d72fd71461ad0 (patch) | |
| tree | 2a8d4f0630d5fb7767591dff539ff71f7fc329c7 /gnuradio-core/src/python | |
| parent | 3ca7aee9244a80aa5f2d65cace16be40d4bf539f (diff) | |
| parent | 0617e68d5f6406e9f18580823e3530b2b21d017a (diff) | |
Merge branch 'next' into next_analog
Diffstat (limited to 'gnuradio-core/src/python')
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/__init__.py | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/gnuradio-core/src/python/gnuradio/gr/__init__.py b/gnuradio-core/src/python/gnuradio/gr/__init__.py index 525c06cf5d..3c16b3b74f 100644 --- a/gnuradio-core/src/python/gnuradio/gr/__init__.py +++ b/gnuradio-core/src/python/gnuradio/gr/__init__.py @@ -28,30 +28,11 @@ Core contents. # This is the main GNU Radio python module. # We pull the swig output and the other modules into the gnuradio.gr namespace -# Temporary workaround for ticket:181. -# Use leading underscores to avoid namespace pollution -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) - from gnuradio_core import * from exceptions import * from hier_block2 import * from top_block import * -if _RTLD_GLOBAL != 0: - sys.setdlopenflags(_dlopenflags) # Restore original flags - # create a couple of aliases serial_to_parallel = stream_to_vector parallel_to_serial = vector_to_stream |