Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

remove uneccesary Config objects from flags.

  • Loading branch information...
commit 00e22658940ba0a382da7440865b6fe6afe160a8 1 parent b11fa90
@minrk authored
View
8 IPython/parallel/apps/baseapp.py
@@ -24,7 +24,6 @@
from subprocess import Popen, PIPE
-from IPython.config.loader import Config
from IPython.core import release
from IPython.core.crashhandler import CrashHandler
from IPython.core.newapplication import (
@@ -100,9 +99,10 @@ def __init__(self, app):
})
base_flags = {
- 'log-to-file' : ({'BaseParallelApplication' : Config({
- 'log_to_file' : True}),
- }, "send log output to a file")
+ 'log-to-file' : (
+ {'BaseParallelApplication' : {'log_to_file' : True}},
+ "send log output to a file"
+ )
}
base_flags.update(base_ip_flags)
View
9 IPython/parallel/apps/ipcontrollerapp.py
@@ -30,7 +30,6 @@
from zmq.log.handlers import PUBHandler
from zmq.utils import jsonapi as json
-from IPython.config.loader import Config
from IPython.core.newapplication import ProfileDir
from IPython.parallel.apps.baseapp import (
@@ -89,13 +88,13 @@
flags.update({
'usethreads' : ( {'IPControllerApp' : {'use_threads' : True}},
'Use threads instead of processes for the schedulers'),
- 'sqlitedb' : ({'HubFactory' : Config({'db_class' : 'IPython.parallel.controller.sqlitedb.SQLiteDB'})},
+ 'sqlitedb' : ({'HubFactory' : {'db_class' : 'IPython.parallel.controller.sqlitedb.SQLiteDB'}},
'use the SQLiteDB backend'),
- 'mongodb' : ({'HubFactory' : Config({'db_class' : 'IPython.parallel.controller.mongodb.MongoDB'})},
+ 'mongodb' : ({'HubFactory' : {'db_class' : 'IPython.parallel.controller.mongodb.MongoDB'}},
'use the MongoDB backend'),
- 'dictdb' : ({'HubFactory' : Config({'db_class' : 'IPython.parallel.controller.dictdb.DictDB'})},
+ 'dictdb' : ({'HubFactory' : {'db_class' : 'IPython.parallel.controller.dictdb.DictDB'}},
'use the in-memory DictDB backend'),
- 'reuse' : ({'IPControllerApp' : Config({'reuse_files' : True})},
+ 'reuse' : ({'IPControllerApp' : {'reuse_files' : True}},
'reuse existing json connection files')
})
Please sign in to comment.
Something went wrong with that request. Please try again.