Skip to content

Commit

Permalink
Removes some swig workaround code put in for ticket 181.
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
trondeau committed Oct 20, 2012
1 parent 0b62e85 commit 1137126
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 43 deletions.
19 changes: 0 additions & 19 deletions gnuradio-core/src/python/gnuradio/gr/__init__.py
Expand Up @@ -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
Expand Down
24 changes: 0 additions & 24 deletions gr-howto-write-a-block/python/__init__.py
Expand Up @@ -23,32 +23,8 @@
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
# ----------------------------------------------------------------

0 comments on commit 1137126

Please sign in to comment.