Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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).
  • Loading branch information...
commit 1137126abd72593db6bc563d4c7dab00ba47e888 1 parent 0b62e85
@trondeau trondeau authored
View
19 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
View
24 gr-howto-write-a-block/python/__init__.py
@@ -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
-# ----------------------------------------------------------------
Please sign in to comment.
Something went wrong with that request. Please try again.