diff --git a/IPython/kernel/configobjfactory.py b/IPython/kernel/configobjfactory.py index b16dbfc..cd4d804 100644 --- a/IPython/kernel/configobjfactory.py +++ b/IPython/kernel/configobjfactory.py @@ -32,7 +32,7 @@ class IConfiguredObjectFactory(zi.Interface): subclass of :class:`IPython.config.configurable.Configurable`. """ - def __init__(config): + def __init__(config=None): """Get ready to configure the object using config.""" def create(): diff --git a/IPython/kernel/fcutil.py b/IPython/kernel/fcutil.py index b2fb012..624eb2c 100644 --- a/IPython/kernel/fcutil.py +++ b/IPython/kernel/fcutil.py @@ -212,8 +212,8 @@ class FCServiceFactory(AdaptedConfiguredObjectFactory): reuse_furls = Bool(False, config=True) interfaces = Instance(klass=Config, kw={}, allow_none=False, config=True) - def __init__(self, config, adaptee): - super(FCServiceFactory, self).__init__(config, adaptee) + def __init__(self, config=None, adaptee=None): + super(FCServiceFactory, self).__init__(config=config, adaptee=adaptee) self._check_reuse_furls() def _ip_changed(self, name, old, new): diff --git a/IPython/kernel/ipcontrollerapp.py b/IPython/kernel/ipcontrollerapp.py index 37cf583..24fb9a9 100755 --- a/IPython/kernel/ipcontrollerapp.py +++ b/IPython/kernel/ipcontrollerapp.py @@ -225,7 +225,7 @@ class IPControllerApp(ApplicationWithClusterDir): controller_service.setServiceParent(self.main_service) # The client tub and all its refereceables try: - csfactory = FCClientServiceFactory(self.master_config, controller_service) + csfactory = FCClientServiceFactory(config=self.master_config, adaptee=controller_service) except FURLError, e: log.err(e) self.exit(0) @@ -233,7 +233,7 @@ class IPControllerApp(ApplicationWithClusterDir): client_service.setServiceParent(self.main_service) # The engine tub try: - esfactory = FCEngineServiceFactory(self.master_config, controller_service) + esfactory = FCEngineServiceFactory(config=self.master_config, adaptee=controller_service) except FURLError, e: log.err(e) self.exit(0)