Show More
@@ -83,12 +83,12 class Exporter(LoggingConfigurable): | |||||
83 | config : config |
|
83 | config : config | |
84 | User configuration instance. |
|
84 | User configuration instance. | |
85 | """ |
|
85 | """ | |
86 | if not config: |
|
86 | with_default_config = self.default_config | |
87 | config = self.default_config |
|
87 | if config: | |
|
88 | with_default_config.merge(config) | |||
|
89 | ||||
|
90 | super(Exporter, self).__init__(config=with_default_config, **kw) | |||
88 |
|
91 | |||
89 | super(Exporter, self).__init__(config=config, **kw) |
|
|||
90 |
|
||||
91 | #Init |
|
|||
92 | self._init_preprocessors() |
|
92 | self._init_preprocessors() | |
93 |
|
93 | |||
94 |
|
94 | |||
@@ -96,15 +96,6 class Exporter(LoggingConfigurable): | |||||
96 | def default_config(self): |
|
96 | def default_config(self): | |
97 | return Config() |
|
97 | return Config() | |
98 |
|
98 | |||
99 | def _config_changed(self, name, old, new): |
|
|||
100 | """When setting config, make sure to start with our default_config""" |
|
|||
101 | c = self.default_config |
|
|||
102 | if new: |
|
|||
103 | c.merge(new) |
|
|||
104 | if c != old: |
|
|||
105 | self.config = c |
|
|||
106 | super(Exporter, self)._config_changed(name, old, c) |
|
|||
107 |
|
||||
108 |
|
99 | |||
109 | def from_notebook_node(self, nb, resources=None, **kw): |
|
100 | def from_notebook_node(self, nb, resources=None, **kw): | |
110 | """ |
|
101 | """ |
General Comments 0
You need to be logged in to leave comments.
Login now