diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-01 11:47:00 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-01 11:47:00 -0400 |
| commit | 49dadf282dff3ab144ced916add4ef148b7378ba (patch) | |
| tree | 539c6292f2315c2471ba29336b0caa972a38e771 /gnuradio-core/src/python/gnuradio/gr | |
| parent | a78f41aa7e67fe9af490f86fe6ff5fe20256c09c (diff) | |
| parent | 58ebe83ee38e45a80ace777a070d2c1fa1ab1df8 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core/src/python/gnuradio/gr')
| -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 |