diff options
Diffstat (limited to 'py/python/Ice.py')
| -rw-r--r-- | py/python/Ice.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/py/python/Ice.py b/py/python/Ice.py index a076a1908d2..a834114dbe4 100644 --- a/py/python/Ice.py +++ b/py/python/Ice.py @@ -478,7 +478,7 @@ class Application(object): if type(self) == Application: raise RuntimeError("Ice.Application is an abstract class") - def main(self, args, configFile=None, logger=None): + def main(self, args, configFile=None, initData=None): if Application._communicator: print args[0] + ": only one instance of the Application class can be used" return False @@ -498,8 +498,8 @@ class Application(object): status = 0 try: - initData = InitializationData() - initData.logger = logger + if not initData: + initData = InitializationData() if configFile: initData.properties = createProperties() initData.properties.load(configFile) |