additional python 2/3 agnosticism
This commit is contained in:
parent
92ba1df2c0
commit
8b00b8459a
|
@ -31,9 +31,9 @@ try:
|
||||||
from dl import RTLD_GLOBAL as _RTLD_GLOBAL
|
from dl import RTLD_GLOBAL as _RTLD_GLOBAL
|
||||||
except ImportError:
|
except ImportError:
|
||||||
try:
|
try:
|
||||||
from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL
|
from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if _RTLD_GLOBAL != 0:
|
if _RTLD_GLOBAL != 0:
|
||||||
_dlopenflags = sys.getdlopenflags()
|
_dlopenflags = sys.getdlopenflags()
|
||||||
|
@ -42,7 +42,7 @@ if _RTLD_GLOBAL != 0:
|
||||||
|
|
||||||
|
|
||||||
# import swig generated symbols into the op25 namespace
|
# import swig generated symbols into the op25 namespace
|
||||||
from op25_swig import *
|
from .op25_swig import *
|
||||||
|
|
||||||
# import any pure python here
|
# import any pure python here
|
||||||
#
|
#
|
||||||
|
|
|
@ -31,9 +31,9 @@ try:
|
||||||
from dl import RTLD_GLOBAL as _RTLD_GLOBAL
|
from dl import RTLD_GLOBAL as _RTLD_GLOBAL
|
||||||
except ImportError:
|
except ImportError:
|
||||||
try:
|
try:
|
||||||
from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL
|
from DLFCN import RTLD_GLOBAL as _RTLD_GLOBAL
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if _RTLD_GLOBAL != 0:
|
if _RTLD_GLOBAL != 0:
|
||||||
_dlopenflags = sys.getdlopenflags()
|
_dlopenflags = sys.getdlopenflags()
|
||||||
|
@ -42,7 +42,7 @@ if _RTLD_GLOBAL != 0:
|
||||||
|
|
||||||
|
|
||||||
# import swig generated symbols into the op25_repeater namespace
|
# import swig generated symbols into the op25_repeater namespace
|
||||||
from op25_repeater_swig import *
|
from .op25_repeater_swig import *
|
||||||
|
|
||||||
# import any pure python here
|
# import any pure python here
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue