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).
---
 gr-howto-write-a-block/python/__init__.py | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'gr-howto-write-a-block/python/__init__.py')

diff --git a/gr-howto-write-a-block/python/__init__.py b/gr-howto-write-a-block/python/__init__.py
index 575cbfc22..2bd27cb31 100644
--- a/gr-howto-write-a-block/python/__init__.py
+++ b/gr-howto-write-a-block/python/__init__.py
@@ -23,32 +23,8 @@ This is the GNU Radio HOWTO module. Place your Python package
 description here (python/__init__.py).
 '''
 
-# ----------------------------------------------------------------
-# Temporary workaround for ticket:181 (swig+python problem)
-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)
-# ----------------------------------------------------------------
-
-
 # import swig generated symbols into the howto namespace
 from howto_swig import *
 
 # import any pure python here
 #
-
-# ----------------------------------------------------------------
-# Tail of workaround
-if _RTLD_GLOBAL != 0:
-    sys.setdlopenflags(_dlopenflags)      # Restore original flags
-# ----------------------------------------------------------------
-- 
cgit