diff options
Diffstat (limited to 'py/python/Ice.py')
| -rw-r--r-- | py/python/Ice.py | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/py/python/Ice.py b/py/python/Ice.py index 1682b85b302..864315974f1 100644 --- a/py/python/Ice.py +++ b/py/python/Ice.py @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. @@ -13,20 +13,6 @@ Ice module import sys, exceptions, string, imp, os, threading, warnings, datetime -try: - import dl - # - # This is necessary for proper operation of Ice plug-ins. - # Without it, RTTI problems can occur. - # - sys.setdlopenflags(dl.RTLD_NOW|dl.RTLD_GLOBAL) -except ImportError: - # If the dl module is not available and we're running on a linux - # platform, use the hard coded value of RTLD_NOW|RTLD_GLOBAL. - if sys.platform.startswith("linux"): - sys.setdlopenflags(258) - pass - # # Import the Python extension. # @@ -302,7 +288,11 @@ class CommunicatorI(Communicator): return self._impl.getDefaultContext() def getImplicitContext(self): - return ImplicitContextI(self._impl.getImplicitContext()) + context = self._impl.getImplicitContext() + if context == None: + return None; + else: + return ImplicitContextI(context) def getProperties(self): properties = self._impl.getProperties() |