From 2208e387d954fbf36b10a115fc3e7f88af64df6b Mon Sep 17 00:00:00 2001 From: Matthias BUSSONNIER Date: Thu, 6 Jun 2013 00:10:53 +0200 Subject: [PATCH] finish up config merging --- nbconvert/exporters/python.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nbconvert/exporters/python.py b/nbconvert/exporters/python.py index 024c91c99..8ef6c0c4b 100644 --- a/nbconvert/exporters/python.py +++ b/nbconvert/exporters/python.py @@ -35,7 +35,8 @@ 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 @@ 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 @@ class PythonExporter(exporter.Exporter): #Call base class constructor. super(PythonExporter, self).__init__(transformers, filters, config, **kw) - - #Set defaults - self.extract_figure_transformer.enabled = False -