From 2d8f647b580039b75838548e93ca5ffb71a4889a Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: Thu, 5 Sep 2013 11:48:24 -0700
Subject: [PATCH] Rebase changes made by hand

---
 IPython/nbconvert/exporters/python.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IPython/nbconvert/exporters/python.py b/IPython/nbconvert/exporters/python.py
index 9d6fdbdde..a3b475155 100644
--- a/IPython/nbconvert/exporters/python.py
+++ b/IPython/nbconvert/exporters/python.py
@@ -15,7 +15,7 @@ Python exporter which exports Notebook code into a PY file.
 
 from IPython.utils.traitlets import Unicode
 
-from .exporter import TemplateExporter
+from .templateexporter import TemplateExporter
 
 #-----------------------------------------------------------------------------
 # Classes