summaryrefslogtreecommitdiff
path: root/py/python/Ice.py
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2006-06-01 16:35:58 +0000
committerDwayne Boone <dwayne@zeroc.com>2006-06-01 16:35:58 +0000
commitdce09becf176726e2805328fe8c2b2ff8a8f6d45 (patch)
treebc759bb9b133c0bfbd0a06b801f1f45d05da00f6 /py/python/Ice.py
parentAdded thread start/stop hooks (diff)
downloadice-dce09becf176726e2805328fe8c2b2ff8a8f6d45.tar.bz2
ice-dce09becf176726e2805328fe8c2b2ff8a8f6d45.tar.xz
ice-dce09becf176726e2805328fe8c2b2ff8a8f6d45.zip
Pass init data rather than logger
Diffstat (limited to 'py/python/Ice.py')
-rw-r--r--py/python/Ice.py6
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)