summaryrefslogtreecommitdiff
path: root/gnuradio-core
diff options
context:
space:
mode:
authorTom Rondeau2012-11-01 11:46:45 -0400
committerTom Rondeau2012-11-01 11:46:45 -0400
commit58ebe83ee38e45a80ace777a070d2c1fa1ab1df8 (patch)
tree350a94adf3addfeb915cd8937d0f1b63bd2d6b0d /gnuradio-core
parentd9a292acb566c6985785352c53c9ce1e3697836c (diff)
parent1137126abd72593db6bc563d4c7dab00ba47e888 (diff)
downloadgnuradio-58ebe83ee38e45a80ace777a070d2c1fa1ab1df8.tar.gz
gnuradio-58ebe83ee38e45a80ace777a070d2c1fa1ab1df8.tar.bz2
gnuradio-58ebe83ee38e45a80ace777a070d2c1fa1ab1df8.zip
Merge branch 'rtld_ticket181_undo'
Diffstat (limited to 'gnuradio-core')
-rw-r--r--gnuradio-core/src/python/gnuradio/gr/__init__.py19
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 602d1119f..e5a8fdbf9 100644
--- a/gnuradio-core/src/python/gnuradio/gr/__init__.py
+++ b/gnuradio-core/src/python/gnuradio/gr/__init__.py
@@ -24,30 +24,11 @@
# 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