diff options
Diffstat (limited to 'py/python/Ice.py')
| -rw-r--r-- | py/python/Ice.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/py/python/Ice.py b/py/python/Ice.py index 1b718e6a56a..1dc8163391d 100644 --- a/py/python/Ice.py +++ b/py/python/Ice.py @@ -729,7 +729,7 @@ class Application(object): raise RuntimeError("Ice.Application is an abstract class") Application._signalPolicy = signalPolicy - def main(self, args, configFile=None, initData=None, overrideProps=None): + def main(self, args, configFile=None, initData=None): if Application._communicator: getProcessLogger().error(args[0] + ": only one instance of the Application class can be used") return 1 @@ -747,10 +747,6 @@ 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 |