From 4e2d3af2a82b31fb523497eccb7ca0cfebd9d169 2010-10-10 22:07:11
From: MinRK <benjaminrk@gmail.com>
Date: 2010-10-10 22:07:11
Subject: [PATCH] merge review fperez-execution-refactor

---

diff --git a/IPython/core/history.py b/IPython/core/history.py
index adf3e9b..7f2af33 100644
--- a/IPython/core/history.py
+++ b/IPython/core/history.py
@@ -372,7 +372,7 @@ def magic_history(self, parameter_s = ''):
             else:
                 print(inline, end='', file=outfile)
         else:
-            print(inline,end='', file=outfile)
+            print(inline, end='', file=outfile)
         if print_outputs:
             output = self.shell.output_hist.get(in_num)
             if output is not None:
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 7c49ccc..790b937 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1565,7 +1565,6 @@ class InteractiveShell(Configurable, Magic):
 
     def _indent_current_str(self):
         """return the current level of indentation as a string"""
-        #return self.indent_current_nsp * ' '
         return self.input_splitter.indent_spaces * ' '
 
     #-------------------------------------------------------------------------
diff --git a/IPython/core/macro.py b/IPython/core/macro.py
index 4a05180..02857ea 100644
--- a/IPython/core/macro.py
+++ b/IPython/core/macro.py
@@ -20,7 +20,7 @@ class Macro(IPyAutocall):
     """
 
     def __init__(self,data):
-        # store the macro value, as a single string which can be executed
+        """store the macro value, as a single string which can be executed"""
         self.value = ''.join(data).rstrip()+'\n'
         
     def __str__(self):