##// END OF EJS Templates
remove uneccesary Config objects from flags.
MinRK -
Show More
@@ -24,7 +24,6 b' import sys'
24
24
25 from subprocess import Popen, PIPE
25 from subprocess import Popen, PIPE
26
26
27 from IPython.config.loader import Config
28 from IPython.core import release
27 from IPython.core import release
29 from IPython.core.crashhandler import CrashHandler
28 from IPython.core.crashhandler import CrashHandler
30 from IPython.core.newapplication import (
29 from IPython.core.newapplication import (
@@ -100,9 +99,10 b' base_aliases.update({'
100 })
99 })
101
100
102 base_flags = {
101 base_flags = {
103 'log-to-file' : ({'BaseParallelApplication' : Config({
102 'log-to-file' : (
104 'log_to_file' : True}),
103 {'BaseParallelApplication' : {'log_to_file' : True}},
105 }, "send log output to a file")
104 "send log output to a file"
105 )
106 }
106 }
107 base_flags.update(base_ip_flags)
107 base_flags.update(base_ip_flags)
108
108
@@ -30,7 +30,6 b' from zmq.devices import ProcessMonitoredQueue'
30 from zmq.log.handlers import PUBHandler
30 from zmq.log.handlers import PUBHandler
31 from zmq.utils import jsonapi as json
31 from zmq.utils import jsonapi as json
32
32
33 from IPython.config.loader import Config
34 from IPython.core.newapplication import ProfileDir
33 from IPython.core.newapplication import ProfileDir
35
34
36 from IPython.parallel.apps.baseapp import (
35 from IPython.parallel.apps.baseapp import (
@@ -89,13 +88,13 b' flags.update(base_flags)'
89 flags.update({
88 flags.update({
90 'usethreads' : ( {'IPControllerApp' : {'use_threads' : True}},
89 'usethreads' : ( {'IPControllerApp' : {'use_threads' : True}},
91 'Use threads instead of processes for the schedulers'),
90 'Use threads instead of processes for the schedulers'),
92 'sqlitedb' : ({'HubFactory' : Config({'db_class' : 'IPython.parallel.controller.sqlitedb.SQLiteDB'})},
91 'sqlitedb' : ({'HubFactory' : {'db_class' : 'IPython.parallel.controller.sqlitedb.SQLiteDB'}},
93 'use the SQLiteDB backend'),
92 'use the SQLiteDB backend'),
94 'mongodb' : ({'HubFactory' : Config({'db_class' : 'IPython.parallel.controller.mongodb.MongoDB'})},
93 'mongodb' : ({'HubFactory' : {'db_class' : 'IPython.parallel.controller.mongodb.MongoDB'}},
95 'use the MongoDB backend'),
94 'use the MongoDB backend'),
96 'dictdb' : ({'HubFactory' : Config({'db_class' : 'IPython.parallel.controller.dictdb.DictDB'})},
95 'dictdb' : ({'HubFactory' : {'db_class' : 'IPython.parallel.controller.dictdb.DictDB'}},
97 'use the in-memory DictDB backend'),
96 'use the in-memory DictDB backend'),
98 'reuse' : ({'IPControllerApp' : Config({'reuse_files' : True})},
97 'reuse' : ({'IPControllerApp' : {'reuse_files' : True}},
99 'reuse existing json connection files')
98 'reuse existing json connection files')
100 })
99 })
101
100
General Comments 0
You need to be logged in to leave comments. Login now