Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove a bunch of unused default_config_file assignments #3651

Merged
merged 2 commits into from Jul 16, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion IPython/consoleapp.py
Expand Up @@ -122,7 +122,6 @@

class IPythonConsoleApp(Configurable):
name = 'ipython-console-mixin'
default_config_file_name='ipython_config.py'

description = """
The IPython Mixin Console.
Expand Down
1 change: 0 additions & 1 deletion IPython/html/notebookapp.py
Expand Up @@ -277,7 +277,6 @@ def init_handlers(self, settings):
class NotebookApp(BaseIPythonApplication):

name = 'ipython-notebook'
default_config_file_name='ipython_notebook_config.py'

description = """
The IPython HTML Notebook.
Expand Down
4 changes: 4 additions & 0 deletions IPython/kernel/zmq/kernelapp.py
Expand Up @@ -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):
Expand Down
5 changes: 0 additions & 5 deletions IPython/parallel/apps/ipclusterapp.py
Expand Up @@ -53,9 +53,6 @@
#-----------------------------------------------------------------------------


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.
Expand Down Expand Up @@ -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.")
Expand Down Expand Up @@ -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):
Expand Down
5 changes: 0 additions & 5 deletions IPython/parallel/apps/ipcontrollerapp.py
Expand Up @@ -82,10 +82,6 @@
#-----------------------------------------------------------------------------


#: 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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions IPython/parallel/apps/ipengineapp.py
Expand Up @@ -58,9 +58,6 @@
# 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
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 0 additions & 4 deletions IPython/parallel/apps/iploggerapp.py
Expand Up @@ -40,8 +40,6 @@
#-----------------------------------------------------------------------------

#: 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
Expand All @@ -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)

Expand Down
6 changes: 1 addition & 5 deletions IPython/terminal/ipapp.py
Expand Up @@ -58,9 +58,6 @@
# 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
Expand Down Expand Up @@ -203,7 +200,6 @@ def start(self):
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

Expand Down Expand Up @@ -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:
Expand Down