Author: jcorgan
Date: 2008-01-25 08:11:37 -0700 (Fri, 25 Jan 2008)
New Revision: 7512
Modified:
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/__init__.py
Log:
Applied changeset r7461 on trunk to release branch.
Modified:
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/__init__.py
===================================================================
---
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/__init__.py
2008-01-25 15:09:48 UTC (rev 7511)
+++
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/__init__.py
2008-01-25 15:11:37 UTC (rev 7512)
@@ -24,6 +24,21 @@
# 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
+
+_dlopenflags = sys.getdlopenflags()
+sys.setdlopenflags(_dlopenflags|_RTLD_GLOBAL)
+
from gnuradio_swig_python import *
from basic_flow_graph import *
from flow_graph import *
@@ -32,6 +47,8 @@
from hier_block2 import *
from top_block import *
+sys.setdlopenflags(_dlopenflags) # Restore original flags
+
# create a couple of aliases
serial_to_parallel = stream_to_vector
parallel_to_serial = vector_to_stream
_______________________________________________
Commit-gnuradio mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/commit-gnuradio
