finish up config merging

nbconvert/exporters/basichtml.py

@@ -44,13 +44,12 b' class BasicHtmlExporter(exporter.Exporter):'
             'basichtml', config=True,
             help="Name of the template file to use")
 
-    _default_config = Config({}) 
 
     def __init__(self, transformers=None, filters=None, config=None, **kw):
        
         c = self.default_config
         if config :
-            c.update(config)
+            c.merge(config)
         
         super(BasicHtmlExporter, self).__init__(transformers=transformers,
                                                 filters=filters,

nbconvert/exporters/exporter.py

@@ -85,9 +85,8 b' class Exporter(Configurable):'
     
     {filters}
     """
-
-
-
+    
+    # finish the docstring
     __doc__ = __doc__.format(filters = '- '+'\n    - '.join(default_filters.keys()))
 
 
@@ -123,6 +122,8 b' class Exporter(Configurable):'
     #constructor for this class.
     transformers = None
 
+    _default_config = Config()
+
     
     def __init__(self, transformers=None, filters=None, config=None, **kw):
         """
@@ -174,7 +175,7 b' class Exporter(Configurable):'
         if self._default_config:
             return Config(deepcopy(self._default_config))
         else :
-            return Config({})
+            return Config()
     
     
     def from_notebook_node(self, nb, resources=None):

nbconvert/exporters/latex.py

@@ -104,7 +104,7 b' class LatexExporter(exporter.Exporter):'
 
         c = self.default_config
         if config :
-            c._merge(Config(config))
+            c.merge(Config(config))
 
         super(LatexExporter, self).__init__(transformers, filters, config=c, **kw)
         

nbconvert/exporters/python.py

@@ -35,7 +35,8 b' class PythonExporter(exporter.Exporter):'
             'python', config=True,
             help="Name of the template file to use")
 
-    def __init__(self, transformers=None, filters=None, config=None, armor=False, **kw):
+
+    def __init__(self, transformers=None, filters=None, config=None, **kw):
         """
         Public constructor
     
@@ -46,7 +47,7 b' class PythonExporter(exporter.Exporter):'
             the Jinja template engine.  Any transformers specified here 
             will override existing transformers if a naming conflict
             occurs.
-        filters : list[of filter]
+        filters : dict{of filter}
             Custom filters to make accessible to the Jinja templates.  Any
             filters specified here will override existing filters if a
             naming conflict occurs.
@@ -56,7 +57,3 b' class PythonExporter(exporter.Exporter):'
         
         #Call base class constructor.
         super(PythonExporter, self).__init__(transformers, filters, config, **kw)
-
-        #Set defaults
-        self.extract_figure_transformer.enabled = False
-        

nbconvert/exporters/rst.py

@@ -43,7 +43,7 b' class RstExporter(exporter.Exporter):'
        
         c = self.default_config
         if config :
-            c._merge(config)
+            c.merge(config)
         
         super(RstExporter, self).__init__(transformers=transformers,
                                                 filters=filters,