diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-05-13 14:22:48 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-05-13 14:22:48 -0230 |
| commit | 46e64f90df4d8da704eea09029458b540e4a3c87 (patch) | |
| tree | 2f99a321f86ba39907cc81f6936ed9b4bbc04858 /py/python/Ice.py | |
| parent | Slice compiler crash when slice file had double slashes (diff) | |
| download | ice-46e64f90df4d8da704eea09029458b540e4a3c87.tar.bz2 ice-46e64f90df4d8da704eea09029458b540e4a3c87.tar.xz ice-46e64f90df4d8da704eea09029458b540e4a3c87.zip | |
Bug 3696 - new Application:main instances
Diffstat (limited to 'py/python/Ice.py')
| -rw-r--r-- | py/python/Ice.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/py/python/Ice.py b/py/python/Ice.py index ab6ce540876..5bc379d4235 100644 --- a/py/python/Ice.py +++ b/py/python/Ice.py @@ -714,7 +714,7 @@ class Application(object): raise RuntimeError("Ice.Application is an abstract class") Application._signalPolicy = signalPolicy - def main(self, args, configFile=None, initData=None): + def main(self, args, configFile=None, initData=None, overrideProps=None): if Application._communicator: getProcessLogger().error(args[0] + ": only one instance of the Application class can be used") return 1 @@ -732,6 +732,10 @@ class Application(object): getProcessLogger().error(traceback.format_exc()) return 1 initData.properties = createProperties(args, initData.properties) + if overrideProps != None: + props = overrideProps.getPropertiesForPrefix('') + for key, value in props.iteritems(): + initData.properties.setProperty(key, value) # # If the process logger is the default logger, we replace it with a |