Remove magic for loading templates from module names

IPython/nbconvert/exporters/html.py

@@ -31,17 +31,11 b' class HTMLExporter(TemplateExporter):'
     filters, just change the 'template_file' config option.  
     """
     
-    file_extension = Unicode(
-        'html', config=True, 
-        help="Extension of the file that should be written to disk"
-        )
+    def _file_extension_default(self):
+        return 'html'
 
-    mime_type = Unicode('text/html', config=True,
-        help="MIME type of the result file, for HTTP response headers."
-        )
-
-    default_template = Unicode('full', config=True, help="""Flavor of the data 
-        format to use.  I.E. 'full' or 'basic'""")
+    def _template_file_default(self):
+        return 'html_full'
     
     output_mimetype = 'text/html'
     

IPython/nbconvert/exporters/latex.py

@@ -35,14 +35,17 b' class LatexExporter(TemplateExporter):'
     'template_file' config option.  Place your template in the special "/latex" 
     subfolder of the "../templates" folder.
     """
+
+    def _file_extension_default(self):
+        return 'tex'
+
+    def _template_file_default(self):
+        return 'article'
     
     file_extension = Unicode(
         'tex', config=True, 
         help="Extension of the file that should be written to disk")
 
-    default_template = Unicode('article', config=True, help="""Template of the 
-        data format to use.  I.E. 'article' or 'report'""")
-
     #Latex constants
     default_template_path = Unicode(
         os.path.join("..", "templates", "latex"), config=True,

IPython/nbconvert/exporters/markdown.py

@@ -26,9 +26,11 b' class MarkdownExporter(TemplateExporter):'
     Exports to a markdown document (.md)
     """
     
-    file_extension = Unicode(
-        'md', config=True, 
-        help="Extension of the file that should be written to disk")
+    def _file_extension_default(self):
+        return 'md'
+
+    def _template_file_default(self):
+        return 'markdown'
 
     output_mimetype = 'text/markdown'
     

IPython/nbconvert/exporters/python.py

@@ -24,9 +24,10 b' class PythonExporter(TemplateExporter):'
     """
     Exports a Python code file.
     """
-    
-    file_extension = Unicode(
-        'py', config=True, 
-        help="Extension of the file that should be written to disk")
+    def _file_extension_default(self):
+        return 'py'
+
+    def _template_file_default(self):
+        return 'python'
 
     output_mimetype = 'text/x-python'

IPython/nbconvert/exporters/rst.py

@@ -26,9 +26,11 b' class RSTExporter(TemplateExporter):'
     Exports restructured text documents.
     """
     
-    file_extension = Unicode(
-        'rst', config=True, 
-        help="Extension of the file that should be written to disk")
+    def _file_extension_default(self):
+        return 'rst'
+
+    def _template_file_default(self):
+        return 'rst'
 
     output_mimetype = 'text/restructuredtext'
 

IPython/nbconvert/exporters/slides.py

@@ -26,15 +26,13 b' from .html import HTMLExporter'
 class SlidesExporter(HTMLExporter):
     """Exports HTML slides with reveal.js"""
     
-    file_extension = Unicode(
-        'slides.html', config=True, 
-        help="Extension of the file that should be written to disk"
-        )
+    def _file_extension_default(self):
+        return 'slides.html'
 
-    output_mimetype = 'text/html'
+    def _template_file_default(self):
+        return 'slides_reveal'
 
-    default_template = Unicode('reveal', config=True, help="""Template of the 
-        data format to use.  I.E. 'reveal'""")
+    output_mimetype = 'text/html'
 
     @property
     def default_config(self):

IPython/nbconvert/exporters/templateexporter.py

@@ -173,15 +173,12 b' class TemplateExporter(Exporter):'
         # template by name with extension added, then try loading the template
         # as if the name is explicitly specified, then try the name as a 
         # 'flavor', and lastly just try to load the template by module name.
-        module_name = self.__module__.rsplit('.', 1)[-1]
         try_names = []
         if self.template_file:
             try_names.extend([
                 self.template_file + self.template_extension,
                 self.template_file,
-                module_name + '_' + self.template_file + self.template_extension,
             ])
-        try_names.append(module_name + self.template_extension)
         for try_name in try_names:
             self.log.debug("Attempting to load template %s", try_name)
             try:

IPython/nbconvert/templates/latex/style_bw_ipython.tplx

@@ -1,6 +1,6 b''
 ((= Black&white ipython input/output style =))
 
-((*- extends 'latex_base.tplx' -*))
+((*- extends 'base.tplx' -*))
 
 %===============================================================================
 % Input

IPython/nbconvert/templates/latex/style_bw_python.tplx

@@ -1,6 +1,6 b''
 ((= Black&white Python input/output style =))
 
-((*- extends 'latex_base.tplx' -*))
+((*- extends 'base.tplx' -*))
 
 %===============================================================================
 % Input

IPython/nbconvert/templates/latex/style_ipython.tplx

@@ -1,6 +1,6 b''
 ((= IPython input/output style =))
 
-((*- extends 'latex_base.tplx' -*))
+((*- extends 'base.tplx' -*))
 
 % Custom definitions
 ((* block definitions *))

IPython/nbconvert/templates/latex/style_python.tplx

@@ -1,6 +1,6 b''
 ((= Python input/output style =))
 
-((*- extends 'latex_base.tplx' -*))
+((*- extends 'base.tplx' -*))
 
 % Custom definitions
 ((* block definitions *))