Merge branch 'master' of github.com:ellisonbg/ipython into newkernel

IPython/kernel/configobjfactory.py

@@ -32,7 +32,7 b' 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():

IPython/kernel/fcutil.py

@@ -212,8 +212,8 b' 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):

IPython/kernel/ipcontrollerapp.py

@@ -225,7 +225,7 b' 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 b' 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)