From 1137126abd72593db6bc563d4c7dab00ba47e888 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Fri, 19 Oct 2012 22:24:06 -0400
Subject: Removes some swig workaround code put in for ticket 181.

This seems to fix the import problems recently seen on 12.10 for loading gnuradio-companion (due to 'from lxml import etree' which was actually due to 'import os' causing a segfault).
---
 gnuradio-core/src/python/gnuradio/gr/__init__.py | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'gnuradio-core/src')

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
-- 
cgit