Merge pull request #3651 from minrk/cleanup

remove a bunch of unused `default_config_file` assignments

These are never used, I don't know where they came from.

IPython/consoleapp.py

@@ -122,7 +122,6 else:
 
 class IPythonConsoleApp(Configurable):
     name = 'ipython-console-mixin'
-    default_config_file_name='ipython_config.py'
 
     description = """
         The IPython Mixin Console.

IPython/html/notebookapp.py

@@ -277,7 +277,6 notebook_aliases = [u'port', u'port-retries', u'ip', u'keyfile', u'certfile',
 class NotebookApp(BaseIPythonApplication):
 
     name = 'ipython-notebook'
-    default_config_file_name='ipython_notebook_config.py'
     
     description = """
         The IPython HTML Notebook.

IPython/kernel/zmq/kernelapp.py

@@ -121,6 +121,10 class IPKernelApp(BaseIPythonApplication, InteractiveShellApp):
     session = Instance('IPython.kernel.zmq.session.Session')
     ports = Dict()
     
+    # ipkernel doesn't get its own config file
+    def _config_file_name_default(self):
+        return 'ipython_config.py'
+    
     # inherit config file name from parent:
     parent_appname = Unicode(config=True)
     def _parent_appname_changed(self, name, old, new):

IPython/parallel/apps/ipclusterapp.py

@@ -53,9 +53,6 from IPython.parallel.apps.baseapp import (
 #-----------------------------------------------------------------------------
 
 
-default_config_file_name = u'ipcluster_config.py'
-
-
 _description = """Start an IPython cluster for parallel computing.
 
 An IPython cluster consists of 1 controller and 1 or more engines.
@@ -176,7 +173,6 class IPClusterStop(BaseParallelApplication):
     name = u'ipcluster'
     description = stop_help
     examples = _stop_examples
-    config_file_name = Unicode(default_config_file_name)
 
     signal = Integer(signal.SIGINT, config=True,
         help="signal to use for stopping processes.")
@@ -247,7 +243,6 class IPClusterEngines(BaseParallelApplication):
     description = engines_help
     examples = _engines_examples
     usage = None
-    config_file_name = Unicode(default_config_file_name)
     default_log_level = logging.INFO
     classes = List()
     def _classes_default(self):

IPython/parallel/apps/ipcontrollerapp.py

@@ -82,10 +82,6 else:
 #-----------------------------------------------------------------------------
 
 
-#: The default config file name for this application
-default_config_file_name = u'ipcontroller_config.py'
-
-
 _description = """Start the IPython controller for parallel computing.
 
 The IPython controller provides a gateway between the IPython engines and
@@ -156,7 +152,6 class IPControllerApp(BaseParallelApplication):
     name = u'ipcontroller'
     description = _description
     examples = _examples
-    config_file_name = Unicode(default_config_file_name)
     classes = [ProfileDir, Session, HubFactory, TaskScheduler, HeartMonitor, DictDB] + real_dbs
     
     # change default to True

IPython/parallel/apps/ipengineapp.py

@@ -58,9 +58,6 from IPython.utils.traitlets import Bool, Unicode, Dict, List, Float, Instance
 # Module level variables
 #-----------------------------------------------------------------------------
 
-#: The default config file name for this application
-default_config_file_name = u'ipengine_config.py'
-
 _description = """Start an IPython engine for parallel computing.
 
 IPython engines run in parallel and perform computations on behalf of a client
@@ -144,7 +141,6 class IPEngineApp(BaseParallelApplication):
     name = 'ipengine'
     description = _description
     examples = _examples
-    config_file_name = Unicode(default_config_file_name)
     classes = List([ZMQInteractiveShell, ProfileDir, Session, EngineFactory, Kernel, MPI])
 
     startup_script = Unicode(u'', config=True,

IPython/parallel/apps/iploggerapp.py

@@ -40,8 +40,6 from IPython.parallel.apps.logwatcher import LogWatcher
 #-----------------------------------------------------------------------------
 
 #: The default config file name for this application
-default_config_file_name = u'iplogger_config.py'
-
 _description = """Start an IPython logger for parallel computing.
 
 IPython controllers and engines (and your own processes) can broadcast log messages
@@ -64,8 +62,6 class IPLoggerApp(BaseParallelApplication):
 
     name = u'iplogger'
     description = _description
-    config_file_name = Unicode(default_config_file_name)
-    
     classes = [LogWatcher, ProfileDir]
     aliases = Dict(aliases)
 

IPython/terminal/ipapp.py

@@ -58,9 +58,6 from IPython.utils.traitlets import (
 # Globals, utilities and helpers
 #-----------------------------------------------------------------------------
 
-#: The default config file name for this application.
-default_config_file_name = u'ipython_config.py'
-
 _examples = """
 ipython --pylab            # start in pylab mode
 ipython --pylab=qt         # start in pylab mode with the qt4 backend
@@ -203,7 +200,6 class LocateIPythonApp(BaseIPythonApplication):
 class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):
     name = u'ipython'
     description = usage.cl_usage
-    default_config_file_name = default_config_file_name
     crash_handler_class = IPAppCrashHandler
     examples = _examples
 
@@ -380,7 +376,7 def load_default_config(ipython_dir=None):
     if ipython_dir is None:
         ipython_dir = get_ipython_dir()
     profile_dir = os.path.join(ipython_dir, 'profile_default')
-    cl = PyFileConfigLoader(default_config_file_name, profile_dir)
+    cl = PyFileConfigLoader("ipython_config.py", profile_dir)
     try:
         config = cl.load_config()
     except ConfigFileNotFound: