Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

remove uneccesary Config objects from flags.

  • Loading branch information...
commit 00e22658940ba0a382da7440865b6fe6afe160a8 1 parent b11fa90
Min RK authored
8 IPython/parallel/apps/baseapp.py
@@ -24,7 +24,6 @@
24 24
25 25 from subprocess import Popen, PIPE
26 26
27   -from IPython.config.loader import Config
28 27 from IPython.core import release
29 28 from IPython.core.crashhandler import CrashHandler
30 29 from IPython.core.newapplication import (
@@ -100,9 +99,10 @@ def __init__(self, app):
100 99 })
101 100
102 101 base_flags = {
103   - 'log-to-file' : ({'BaseParallelApplication' : Config({
104   - 'log_to_file' : True}),
105   - }, "send log output to a file")
  102 + 'log-to-file' : (
  103 + {'BaseParallelApplication' : {'log_to_file' : True}},
  104 + "send log output to a file"
  105 + )
106 106 }
107 107 base_flags.update(base_ip_flags)
108 108
9 IPython/parallel/apps/ipcontrollerapp.py
@@ -30,7 +30,6 @@
30 30 from zmq.log.handlers import PUBHandler
31 31 from zmq.utils import jsonapi as json
32 32
33   -from IPython.config.loader import Config
34 33 from IPython.core.newapplication import ProfileDir
35 34
36 35 from IPython.parallel.apps.baseapp import (
@@ -89,13 +88,13 @@
89 88 flags.update({
90 89 'usethreads' : ( {'IPControllerApp' : {'use_threads' : True}},
91 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 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 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 96 'use the in-memory DictDB backend'),
98   - 'reuse' : ({'IPControllerApp' : Config({'reuse_files' : True})},
  97 + 'reuse' : ({'IPControllerApp' : {'reuse_files' : True}},
99 98 'reuse existing json connection files')
100 99 })
101 100

0 comments on commit 00e2265

Please sign in to comment.
Something went wrong with that request. Please try again.