Changeset 7512

Timestamp:

01/25/08 08:11:37

Author:

jcorgan

Message:

Applied changeset r7461 on trunk to release branch.

Files:

• gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/__init__.py (modified) (2 diffs)

gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/__init__.py

@@ -25 +25 @@
-# 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 *
@@ -33 +48 @@
-from top_block import *
-
+sys.setdlopenflags(_dlopenflags)             # Restore original flags
+
-# create a couple of aliases
-serial_to_parallel = stream_to_vector